am 4ad35f9c: am 8a0399c4: Merge "BluetoothManagerService: Enforce DUMP permission" into lmp-mr1-dev
automerge: 6f2ea24

* commit '6f2ea24086be9eb9650aa647c25843d9371c77f7':
  BluetoothManagerService: Enforce DUMP permission