[automerger skipped] Merge changes Ia2ae5322,I09cfefbc into tm-dev am:...

[automerger skipped] Merge changes Ia2ae5322,I09cfefbc into tm-dev am: 406be8f9 am: 5dc72ff8 -s ours

am skip reason: Merged-In Ia2ae5322246c0553aafc084e0cc9f900f0e5ca5c with SHA-1 150f8166 is already in history

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



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