[automerger skipped] Merge "24Q4: Removal of...

[automerger skipped] Merge "24Q4: Removal of a2dp_offload_codec_extensibility_settings" into main am: bc86ae05 am: 06695ec0 -s ours

am skip reason: Merged-In If9c710c0aaed7326b32dd2e7d5f3109de4047b97 with SHA-1 2c869d33 is already in history

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



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