[automerger skipped] Merge changes from topic "aml_blu_331716000" into...

[automerger skipped] Merge changes from topic "aml_blu_331716000" into udc-dev-plus-aosp am: 1b8614c8 -s ours am: 9b7105c2 -s ours

am skip reason: Merged-In Ifd2893abedcb181e67c1de8d6d6a8dfa38381696 with SHA-1 c487f626 is already in history

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



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