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

am skip reason: Merged-In I4e2a72a80f68579d60466e859370b6fd93a8cd23 with SHA-1 aa322bc4 is already in history

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



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