Merge "Disconnect to car service in CarProxyActivity onDestroy()" into nyc-car-dev