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

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

Change-Id: I2a47fe180438827f2a0be082816668003856b712
Merged-In: I73b8d68680b23d320d4e873252002b758d99c0ae