[automerger skipped] Change nullability of inheriting function of...

[automerger skipped] Change nullability of inheriting function of PinPrivacyPreferenceController am: 4ca80e60 -s ours

am skip reason: Merged-In Idbfa244921957be2bba3cd02e5e873e81e8807d8 with SHA-1 a7d7eb9a is already in history

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



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