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

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

Change-Id: Id9689e3dfa641c0e004c9dc975e281358bed7ad7