[automerger skipped] Merge "Fix method not enforcing correct permissions" into...

[automerger skipped] Merge "Fix method not enforcing correct permissions" into tm-dev am: f9610d40 am: ea8479df -s ours am: e2982ad5 -s ours am: 3cda4465 -s ours

am skip reason: Merged-In I5285f0754775c56a73ad1b6eef4bdb7ec3d59757 with SHA-1 1b853212 is already in history

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



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