Merging from ub-launcher3-master @ build 6437481

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

Change-Id: Idea6ff9a1f932917c5abf4aa94d79f422c97949e