Merging from ub-launcher3-master @ build 6675739

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

Change-Id: Ia528ecb141d547f9b560ade798f05662318c3a45