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

* commit '040b417fd85a6b99ff53e4805be17ffde5f6a3c6':
  Camera2 legacy: Improve robustness to camera service crashes