am 5945282c: am 040b417f: am 4b168708: am 9ceeb831: am 93f0b612: Camera2 legacy: Improve robustness to camera service crashes

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