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: I74ae8bea8c64f116ca7663569cc0e9569f506ca5