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