tree dcb335d8e4766bf3d099c2b64cfe8314804235e3
parent 8a27ba85bce6be851854a1c1266ab03e521e1bac
parent 9a3166409d76681ee7e83f251868d0c24ac0e4f5
author Santiago Etchebehere <santie@google.com> 1594661882 -0700
committer Santiago Etchebehere <santie@google.com> 1594661882 -0700

Merging from ub-launcher3-master @ build 6675739

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

Change-Id: I748492914f9556072d0a489ac7b11f680251119b