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

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

Change-Id: Ifc8c251ef0f03e66de3b1c9fa94bfcb980704769