Android N Preview 4 (NPD56N)
Merge "Unlock mBluetoothLock.readLock() instead of double-locking it"