Merging from ub-launcher3-master @ build 6269120

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

Change-Id: I28e2e4679c13596dbd7abc8941d7af248ec90833