Merge changes Ia5ad66b0,If0d7fc83,Idf5f22c9 am: b6dc5780 am: 1e502253 am:...

Merge changes Ia5ad66b0,If0d7fc83,Idf5f22c9 am: b6dc5780 am: 1e502253 am: e50afcc3 am: ee6a892a am: 21817dcc

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



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