Merging from ub-launcher3-master @ build 6538369

Bug:154410862
Test: manual, presubmit on the source branch
x20/teams/android-launcher/merge/ub-launcher3-master_rvc-d1-dev_6538369.html

Change-Id: Ib245caf7e9b59a418d228d9e5cef9ba31439e76e