tree b8c55b529b59ca29ac6a14783c620d3c55199c45
parent 3d051487502235fed463cbdae0de3a6f454ce184
parent 2f04a9d271379c790845e73acff4c463294cdcb3
author Santiago Etchebehere <santie@google.com> 1588052431 -0700
committer Santiago Etchebehere <santie@google.com> 1588052431 -0700

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

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

Change-Id: I28d6ec42b7a6a8e779abb306cc29c9801910206f