Merge changes I5ccf498c,Ifcd68ba5 am: d4c1708c am: 544776dc am: cd43ef5a...

Merge changes I5ccf498c,Ifcd68ba5 am: d4c1708c am: 544776dc am: cd43ef5a am: fe750778 am: c139a943

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



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