Merge "Change nullability of inheriting function of...

Merge "Change nullability of inheriting function of PinPrivacyPreferenceController" into udc-dev-plus-aosp am: 942e44c0

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



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