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

[automerger skipped] Merge "Change nullability of inheriting function of PinPrivacyPreferenceController" into main am: 1937711c am: e75ae19e -s ours am: 19688da9 -s ours

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

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



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