Merge changes Ib4399f9c,I744267ec am: 983005bb am: 5ac6010d am: 9e932e5c...

Merge changes Ib4399f9c,I744267ec am: 983005bb am: 5ac6010d am: 9e932e5c am: ee420d45 am: e5ab8cfb

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



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