Merge changes I5d69a5f8,Ibcc56886 into tm-dev am: 4da0d165 am: b38be5b6 am: 33bb3c3f

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



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