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

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



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