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

Change-Id: I54b67a8c2ebd43084283c0fc7bf7756fb696e5cb