Merge "camera2: Update openCamera calls now that it is async" into klp-dev