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

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

Change-Id: Ic7b1cf59379402e125394f3fbe826c56c17d9fdd
Merged-In: Ia78f542e03f7d0adb49f3c06021824cf624ce376