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 am: 2cef7918

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



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