[automerger skipped] Merge "Revert "Update permission enforcement for...

[automerger skipped] Merge "Revert "Update permission enforcement for BluetoothDevice SystemApis"" am: 3ad8eb5f am: 10a8b86b -s ours am: ab949128 -s ours

am skip reason: Change-Id I351fc3d0d426d0d4a8e708cadf0cd326da495ac0 with SHA-1 3698c522 is in history

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

Change-Id: I630e3fd02852c409b38bc11fcab91664d6398110