Merging from ub-launcher3-master @ build 6668015

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

Change-Id: I9a989e6cd3f5f2e618af98685691d05549630f44