Merging from ub-launcher3-rvc-dev @ build 6552182

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

Change-Id: I795aafd151c6ce53077e1aebb97567eedd84f274
Merged-In: I795aafd151c6ce53077e1aebb97567eedd84f274