Merge "Camera2: Update tests to use different API." into klp-dev