Merge "Unlock mBluetoothLock.readLock() instead of double-locking it am: 7ee53be300 am: 7fbbbd5ea1" into nyc-mr1-dev-plus-aosp