Merge "Change nullability of inheriting function of PinPrivacyPreferenceController" into udc-dev-plus-aosp