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

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

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



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