tree cc44063cb16246848917bc0b389684dd86672191
parent d85ab8c8d823e3ef41271f8f725d2a3a740165b5
parent 9029902721db2401db8ee1af10f6771113384cc7
author Samuel Fufa <sfufa@google.com> 1633734427 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1633734427 +0000

Merge changes I097134c4,Icfe39c30 into sc-v2-dev am: 8469dc98c6 am: 9029902721

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

Change-Id: I5b3d7943f58aa4858cb592c9335e1ec54eab3691