Merge changes I97ca96d5,Ie3d023b3,Ief254d37,I83b23ce1 am: b671abf7 am:...

Merge changes I97ca96d5,Ie3d023b3,Ief254d37,I83b23ce1 am: b671abf7 am: f537e5db am: 2442d8d3 am: 7f278990

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



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