Merging from ub-launcher3-rvc-qpr-dev @ build 6777894

Bug:150504032
Test: manual, presubmit on the source branch
x20/teams/android-launcher/merge/ub-launcher3-rvc-qpr-dev_rvc-qpr-dev_6777894.html

Change-Id: I478d348b15a769ff27088eb858f4d22bc21c1629
Merged-In: I41c922eedb613f733ff34c0b6f0cf5f4af48c9c0