[automerger skipped] Merge Android 14 am: 25d4f120 -s ours

am skip reason: Merged-In I8798f723bc821241d70fc8e5cb2c6ae59d7115af with SHA-1 5d8fea06 is already in history

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



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