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

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

Change-Id: I9ce7f3e6a95d278509fe18b36c84d871a76066f1