Merging from ub-launcher3-master @ build 6476761

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

Change-Id: Idbde25a62efd946b98057b4bac2d3dc5f0128bbc