Merging from ub-launcher3-master @ build 6519151

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

Change-Id: I3b0891cd7ab31f39844a843818dade3709cd4437