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

Change-Id: Ib00b60889c96f4095f537ca7a3e0fd152856c2b2