[automerger skipped] Fix permission bypasses to multiple methods am: 5fe72f93 am: 5ed48c4a -s ours

am skip reason: Merged-In I76f49fee440726a7c0714385564ddf0e3e8522b5 with SHA-1 8098771b is already in history

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



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