Merge "Update BluetoothDevice SystemApi permissions and disallow passing a null pin to BluetoothDevice#setPin" am: 5f1daae19f

Change-Id: I4204ee9c10101d99fc8e4bad4ee44fc431f2cb9f