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

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

Change-Id: I232cf8ad8af7f6b0d2a22bffedb8875edda5c291
Merged-In: I71e15bebfa93b99835eff08da0308430a1a7605a