Merge "camera2: Fix deadlocks in shim #close and make #testInvalidCapture pass"