[automerger skipped] Merge Android 12 QPR3 ab/8391262 am: e24db03da4 -s ours am: 1eff2959d1 -s ours

am skip reason: Merged-In Ifdaf4928e7f1f0da5deb7dd44a6b89f5f08cdf2c with SHA-1 bd2860f039 is already in history

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

Change-Id: I9afe65f3ce14ffdb7473e25a9a7763bdaed4e276
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>