tree d32dba7530d13a44210312437752e3410c93ccb9
parent 15ad4bf40257b25333ebd1c0177aa9ea1b92127d
parent 001543fdce6b9bbc26db8b3638fee43ac7aea7ce
author Alina Zaidi <alinazaidi@google.com> 1623360671 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1623360671 +0000

Merge changes I5d1c9e4b,I08154c94 into sc-dev am: 1fbf9200f1 am: 18d07beef4 am: 001543fdce

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14899453

Change-Id: I86b96b495c3fee30bebc37a3f62f4d6b34d5895d