Merging from ub-launcher3-master @ build 6639132

Bug:154410862
Test: manual, presubmit on the source branch
x20/teams/android-launcher/merge/ub-launcher3-master_rvc-d1-dev_6639132.html

Change-Id: I1b55daff75f332888d34a8f725126d756d7bbb14
Merged-In: I45c9d6441ddd1c32efaba73770f458f722a81bac