Merge "Camera2/3: Add more tracing for API1" into klp-dev