[automerger skipped] Merge "Fix permission bypasses to multiple methods" into...

[automerger skipped] Merge "Fix permission bypasses to multiple methods" into tm-dev am: d7d02609 am: c43708ed am: cd3183c3 -s ours am: 10c0a693 -s ours

am skip reason: Merged-In I9bf6fac218dccc092debe0904e08eb23cc4583c0 with SHA-1 5fe72f93 is already in history

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



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