Merge changes If3a14dbf,Ie1bb8314 am: e7bd6e62 am: 947062fe am: 96dad907...

Merge changes If3a14dbf,Ie1bb8314 am: e7bd6e62 am: 947062fe am: 96dad907 am: c0df05bc am: 99f04f02

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



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