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

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

Change-Id: Iba694d82f686e3affe6cd71a14895e3cf06166c7