tree b99e311c5cc759a6fd38bd1ddc7a1da3b3b6a5f6
parent f3779f129f7326cb7acb57bf6aabd68aca5b6218
parent 3aaf3967348ff55d2b8ac6d50e59ea01d9362af9
author Vinit Nayak <peanutbutter@google.com> 1584145832 -0700
committer Hyunyoung Song <hyunyoungs@google.com> 1584339258 +0000

Merging from ub-launcher3-master @ build 6294827

 Bug:150504032
 Test: manual, presubmit on the source branch
 x20/teams/android-launcher/merge/ub-launcher3-master_rvc-dev_6294827.html

Change-Id: I74ae8bea8c64f116ca7663569cc0e9569f506ca5