Merging from ub-launcher3-rvc-dev @ build 6617269

Bug: 150504032
Test: manual, presubmit on the source branch
https: //android-launcher.teams.x20web.corp.google.com/merge/ub-launcher3-rvc-dev_master_6617269.html
Change-Id: I2a168bfa8e3979ade26ab1d3cddbbae84cf79590