Merge "Change nullability of inheriting function of PinPrivacyPreferenceController" into main