tree 6bf76611bea08a8f8f0452830fa2d6f297a32805
parent 70b3d2a0bacfd4a46a51f27ce6dbac1ff55c92b2
parent dbff60ff5e851d8ea8fd0aac2b1821ced6b99145
author Hyunyoung Song <hyunyoungs@google.com> 1575448952 -0800
committer Hyunyoung Song <hyunyoungs@google.com> 1575448952 -0800

Merging from ub-launcher3-master @ build 6048063

Test: manual, presubmit on the source branch
http://x20/teams/android-launcher/merge/ub-launcher3-master_6048063.html

Change-Id: Ieee38cc301364f96cf252b2387142b0aa1b75317