Merge changes I1e5a5a5a,Ibc90196e,I2bbc1b6a am: 14a3d390 am: 0b611f1d am:...

Merge changes I1e5a5a5a,Ibc90196e,I2bbc1b6a am: 14a3d390 am: 0b611f1d am: a69c3124 am: d1a24a76

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



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