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

[automerger skipped] Merge "Fix method not enforcing correct permissions" into tm-qpr-dev am: b1b9f2ee -s ours am: 32fda9fd -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/+/19517360



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