Merge changes I7fcb7c46,Ia39886c4 into tm-dev am: 70614401 am: 8f63d02a am: 937c7aa8

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



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