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

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

Change-Id: Ia2feae3192f875638692e55f4c88746c0a8159a3