[automerger skipped] Merge Android 12 QPR 3 am: 5e36e260 -s ours am:...

[automerger skipped] Merge Android 12 QPR 3 am: 5e36e260 -s ours am: 7d8d41ac -s ours am: 0e1fc6e6 -s ours am: 2d19a4a4 -s ours

am skip reason: Merged-In I540ce3429cb4b1b86b8554a08677679c932b05e5 with SHA-1 bf8a2429 is already in history

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



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