Merge changes I5d69a5f8,Ibcc56886 into tm-dev am: 4da0d165 am: 96f9b280

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



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