Merge changes I4d144b35,I7d0646d5 am: eb9c1dd9 am: 640e7851 am: a37d87b9

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



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