Merge "Add ContentObserver to RedactNotificationPreferenceController"