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

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

Change-Id: I743cfd1a726d223ed6e1e5c0cfb9dc64a9d0c306