Merge "Change nullability of inheriting function of...

Merge "Change nullability of inheriting function of PinPrivacyPreferenceController" into main am: 1937711c

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2717673



Change-Id: I902d13988333ad9782e9882a6b939b2f195832ec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>