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

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

Change-Id: I4be85d0e52cc3cb8801012a7313a269851680c8b