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

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

Change-Id: I53b084ca2dc94d94f87d696bbfd7666b55d712ad