tree 24b1d8546d4bbe12910e18ec15708fdb74166414
parent 741fbf67bcfa58ccbd6f2915c0a6c7b4245477a3
parent f619e598f77c8e3597d6f19d9a49d9050a5fe467
author Adam Cohen <adamcohen@google.com> 1591137078 -0400
committer Adam Cohen <adamcohen@google.com> 1591137078 -0400

Merging from ub-launcher3-master @ build 6552470

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

Change-Id: Ieeb620c33785945c629ce9fcabc6a1cda50eda44