Merging from ub-launcher3-master @ build 6639132

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

Change-Id: I1faca09377c3a89abb0941e09edfb98c7849ddf7