Merge "Merge changes I64de4bb5,I765f4a82,I2f2054c6,I5fdc54d0,I5dc62758, ......

Merge "Merge changes I64de4bb5,I765f4a82,I2f2054c6,I5fdc54d0,I5dc62758, ... into tm-dev am: 274267cd am: 385d7306" into tm-d1-dev-plus-aosp am: a41f23bf am: a0ee7382

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



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