Merge "Camera2: Do not throw unexpected runtime exception to app" into mnc-dev