Merging from ub-launcher3-master @ build 6294827

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


Change-Id: I38a587a1ba0fb3a821eb84d13581fdb82fdc72e3
1 file changed