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

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



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