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

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

Change-Id: If639a1565ce5c4af36d7bce3701b0d1d77fedec0