tree d32dba7530d13a44210312437752e3410c93ccb9
parent 79412e481d0389db86b64cf9c211e81266b5bf5d
parent 784d08da4ee4be7385d67640c1ab399f15060510
author Alina Zaidi <alinazaidi@google.com> 1623360634 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1623360634 +0000

Merge changes I5d1c9e4b,I08154c94 into sc-dev am: 1fbf9200f1 am: e908dbba29 am: 784d08da4e

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

Change-Id: I631f290d0df10f42f633c489bdb4043bd6c400d8