Merging from ub-launcher3-master @ build 6655765

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

Change-Id: I37ad0a7145303a2d54edfd802e02a8683269389a