Merge "Fix GATT autoConnect race condition" into nyc-dev