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

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

Change-Id: I23f7656c1cc1fcc922aab4f533bcb25509bc882f