tree 4fba54d36fffed9bf3cebf2b76976a4776e11995
parent db252eb5c78c2c00e62d2e076ebdfd62587e8ef8
parent ea6ec109435fd65d241eebd1af03b37e777ff18a
author Santiago Etchebehere <santie@google.com> 1594338785 -0700
committer Santiago Etchebehere <santie@google.com> 1594338785 -0700

Merging from ub-launcher3-master @ build 6668015

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

Change-Id: I3d80f6fc46ff8ba9b633cd2e7c46749d95964118