Merge commit '2cd8dd628268a177357afcccfeb7da8639e3a061' into merge_ub-launcher3-master_6976145

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

Change-Id: Ic13b1a20cc3d555e8e86717ca0da97103ff09c85