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

Change-Id: Ia828146b8ab13047373dd345bee56fbe9683bbef