Merge "Camera: Check consumer interface before disconnecting"
am: aa59be48d4

Change-Id: I2c1b1878b8ca56bcce5a977afec2170a62a738a0