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

am skip reason: Merged-In Ide8d92d2466a993af041de3a62d25b375f5b4dd7 with SHA-1 f6d1335e66 is already in history

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

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