[automerger skipped] Merge "Merge tm-dev-plus-aosp-without-vendor@8763363" into stage-aosp-master am: 141ca8f4 -s ours am: f6451890 -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: I9b5c1e082ffa19b685b83d2c14902023e130a9fb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>