Merging from ub-launcher3-master @ build 6639132

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

Change-Id: I45c9d6441ddd1c32efaba73770f458f722a81bac