Merge "Camera2: Handle binder death on ICameraDeviceUser" into nyc-dev