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

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

Change-Id: Idbd94a78c2e3fd8c8b342b17e2b6943fe74fcd18
Merged-In: I9a2dc2f20e0a81999741f5e087bdf849926af377