Merge branch 'security-aosp-pi-release' into int/p/fp2

* security-aosp-pi-release:
  RESTRICT AUTOMERGE Fix make Bluetooth discoverable without additional permission
  BluetoothSecurity: Add BLUETOOTH_PRIVILEGED permission for pairing dialog

Change-Id: I24c5675367adfd3a1da8d9ecc0c31eed0bf37802