Merge "Camera: Do not update state at HAL starts up if state already exists" am: c3ee35f339
am: 05ca87ccf4

Change-Id: Ie7e5ab214485ab8eda9f3630a7df78486d1e0921