Merging from ub-launcher3-master @ build 6327709

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

Change-Id: I4688cf4d82f9f7afaebc37e32646210816de378d