tree 11286a2d53be62008e2a4e2951507ea36ce4c345
parent 211ddba6a7ef367af8f5f550bfb1f902fe255856
parent f5bbbc074eb295d8248aea3a660db02786dc2573
author Tony Wickham <twickham@google.com> 1631220809 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1631220809 +0000

Merge changes I032f7ffc,I384d7af0 into sc-v2-dev am: 94c673c64d am: f5bbbc074e

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

Change-Id: I296e5993e25b077cf0c93e1c8345f1cb0f5fe864