* commit '5945282cc522af359b4518d4ad14f1e85c198812': Camera2 legacy: Improve robustness to camera service crashes