Merge changes I8e37ac14,Ic8642a39,I06eb6d80 into tm-dev am: a9d77d24 am: fbfcd021 am: 9d337bf0

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



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