Merge "Introduce FileEncryptionPreferenceController"