Merging from ub-launcher3-master @ build 6552470

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

Change-Id: Ieeb620c33785945c629ce9fcabc6a1cda50eda44