Merge "Camera2: Fix Camera integration test deadlock" into klp-dev