[automerger skipped] Merge "Merge 24Q4 into AOSP main" into main am: b1c96fcf -s ours

am skip reason: Merged-In I2c1246a4b34c6b09a42c05153c0e3f015d475df1 with SHA-1 c47df627 is already in history

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



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