Merging from ub-launcher3-master @ build 6369897

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

Change-Id: I5e62a4b492bc01dfa0c03b004f044de8593970b2