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

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

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



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