[automerger skipped] Merge tm-dev-plus-aosp-without-vendor@8763363 am: 22d51c00 -s ours am: 63e99e33 -s ours

am skip reason: Merged-In I51f54f2fe8a91ee4ee28e1e58494e596510ebb55 with SHA-1 b94e4d79 is already in history

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



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