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