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: I07e33e1adc083d4762e78e97e0763bf315ae6755
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>