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

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