[automerger skipped] Merge changes Idbb12b55,Id1e4cb30 into tm-dev am:...

[automerger skipped] Merge changes Idbb12b55,Id1e4cb30 into tm-dev am: 84cd9ab5 -s ours am: 310e82e6 -s ours am: 410853cd -s ours am: 13dacb3e -s ours

am skip reason: Merged-In Idbb12b55db96b00bb695c54af1fd0efcc1f65841 with SHA-1 d60ae6c0 is already in history

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



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