[automerger skipped] Merge "Update BluetoothDevice SystemApi permissions and disallow passing a null pin to BluetoothDevice#setPin" am: 5f1daae19f am: a1b84782c5 -s ours am: 1572f44b88 -s ours
am skip reason: Change-Id I74613d61420babecf5f1976fe33a2e1a729b71a1 with SHA-1 82425166a8 is in history
Change-Id: I61464075fb73890dcc9bc959cb6aba2d04be3f3e
This commit is contained in: