Merge "Enable PhotoPicker file path redaction test"