Merging from ub-launcher3-master @ build 6356169

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

Change-Id: I15813ebeced89d9402d5721c8fc497d403b00d88