Merge "Camera2: Fix availableTestPatternModes type"