* commit '9ceeb831c412d80b0961bcf38d81c789aba1718b': Camera2 legacy: Improve robustness to camera service crashes