Merge changes I9dc3c034,I34bb2687 am: 2029e247 am: e3907430 am: f9fef559...

Merge changes I9dc3c034,I34bb2687 am: 2029e247 am: e3907430 am: f9fef559 am: 7bee1c77 am: e74c23e5 am: 0bb05a34

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



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