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