Merge "Fix permission bypasses to multiple methods" into tm-dev am: d7d02609 am: c43708ed am: cd3183c3

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



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