Merge "Camera: fix camera status after HAL crash"
am: 3718b84a36  -s ours

Change-Id: I25e36c2c1ccfad5be4d52d29eddf2d019c741ea7