[automerger skipped] Merge "Camera: Do not update state at HAL starts up if...
[automerger skipped] Merge "Camera: Do not update state at HAL starts up if state already exists" am: c3ee35f3 am: 05ca87cc
am: fcbaf540 -s ours
Change-Id: I916a7830e8e6fccab440b6ec867007bf86f13ce1