Merge changes I64ce6648,Ia8a3e680 am: 0117404b am: f902a731 am: 3297c880...

Merge changes I64ce6648,Ia8a3e680 am: 0117404b am: f902a731 am: 3297c880 am: 352d34eb am: a1edc136

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



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