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

Change-Id: I1dad2b3cd59022ff61d1d177e30e2269b2fb0887