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