Merge changes I6322c99c,Id973755e am: c62bb3d4 am: 04bf0222 am: 8a133863...

Merge changes I6322c99c,Id973755e am: c62bb3d4 am: 04bf0222 am: 8a133863 am: 5cd7521c am: e4483ad0

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



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