[automerger skipped] Merge changes I38df1e0c,I0b9b3f1b into tm-dev am: 5f10cb19 am: c3f02afd am: 9395213e am: 2301be15 -s ours

am skip reason: Merged-In I38df1e0cbdde369935d2d19c4798a9277bc3ade1 with SHA-1 4c19513d is already in history

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



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