tree bd85783d313d627b2aa2b2fc2887aa3720a5a2de
parent 2b515c70583f03f0e13047e2b0dd21ce3554e9ac
parent 5e204ff61a939eecf90bb6d3d620cfb70ea71d4e
author Pinyao Ting <pinyaoting@google.com> 1591825553 -0700
committer Pinyao Ting <pinyaoting@google.com> 1591826051 +0000

Merging from ub-launcher3-rvc-dev @ build 6577335

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

Change-Id: Ie1f44dd646088759fef66251fe9e5f584b804d73