tree 7577f57cc17ebcf1302f0d8ccd36fd1c1662ffae
parent 4ff61e0876f5403f0481a360e4621c65afcdf6c2
parent ae054d85849ed38db488153f00be09db4b44da84
author Bill Lin <lbill@google.com> 1622767788 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1622767788 +0000

Merge changes I7b9e6e7f,I9729cd40 into sc-dev am: 51b35256d2 am: ae054d8584

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

Change-Id: I775c0edcfe403c854a7c87104fa9aba78761f18d