[automerger skipped] Merge changes from topic "le-audio-32k" into tm-dev am:...

[automerger skipped] Merge changes from topic "le-audio-32k" into tm-dev am: 7f5c7c66 -s ours am: dd0708a5 -s ours am: 60ab8a48 -s ours am: f1d2c975 -s ours

am skip reason: Merged-In I653f0fa414fbaf783e65e99210e47ab38dc6a700 with SHA-1 c6365d8b is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/18332635



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