[automerger skipped] Merge UP1A.231005.007 am: 1f225ad1 -s ours am:...

[automerger skipped] Merge UP1A.231005.007 am: 1f225ad1 -s ours am: a2ab0c4c -s ours am: 23af29f2 -s ours

am skip reason: Merged-In Ibce32cc09ad2991789569f35ef2f71f90537fdce with SHA-1 7a62a311 is already in history

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



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