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

[automerger skipped] Merge "Change nullability of inheriting function of PinPrivacyPreferenceController" into udc-qpr-dev-plus-aosp am: fde4c5d8 -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: If05c5aa2a8797be34742f4a9c978cab84f02d202
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>