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

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

Change-Id: I280025d9e58626fe725fe24ca60c28e89d0cee74
53 files changed