Merging from ub-launcher3-master @ build 6665145

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

Change-Id: I6012c5008ef8d6ffaa3409c8b601ddcd6262f422