Merging from ub-launcher3-master @ build 6304996

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

Change-Id: I6ddd8ff2c3643b5682ce108921d30febdd7f72d2