Merge changes I568fa4d8,I7536e12a am: 65936719 am: 2c600591 am: 71bdb602...

Merge changes I568fa4d8,I7536e12a am: 65936719 am: 2c600591 am: 71bdb602 am: 799bd074 am: b438e9e9

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



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