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

Change-Id: I920928c142a3af8fbc04b192fed6f208ca4a1f1e