Merge changes I7fcb7c46,Ia39886c4 into tm-dev am: 70614401 am: 9e6d256d

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



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