Merge \\"Unlock mBluetoothLock.readLock() instead of double-locking it\\" am: 4467c845c0
am: 2df165b8db

Change-Id: I89b60a4b78ea3221e7a880c558cd6fd591298d76