Merge "Fix method not enforcing correct permissions" am: ac8e110a am:...

Merge "Fix method not enforcing correct permissions" am: ac8e110a am: 3b2c8166 am: 3fed6dd1 am: 5f845301

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



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