[automerger skipped] Merge "Update permission enforcement for BluetoothDevice...
[automerger skipped] Merge "Update permission enforcement for BluetoothDevice SystemApis" am: 91fb9876 am: 78d25b9d -s ours
am skip reason: Change-Id I2fd1acaeddfa4de2033b2e23b25afa1b8f57e8af with SHA-1 78d61bc1 is in history
Change-Id: Ibe78810e5115357a57576020d3a09d07c128333e