[automerger skipped] Merge ab/AP4A.240925.013 into aosp-main-future am: 7b31be6dfa -s ours

am skip reason: Merged-In If0497fcc17bb0ec44294c4ea1163104b4d8be459 with SHA-1 7519b7c2e6 is already in history

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

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