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

[automerger skipped] Merge changes Idbb12b55,Id1e4cb30 into tm-dev am: 84cd9ab5 am: 35c96f61 am: b4bed38d -s ours am: 9ae8ce4e -s ours

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

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



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