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

[automerger skipped] Merge "Change nullability of inheriting function of PinPrivacyPreferenceController" into udc-dev-plus-aosp am: 942e44c0 am: 5a6d7745 -s ours am: e81a0072 -s ours

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

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



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