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