[automerger skipped] Merge "Mark StructNdOptPref64#prefix @NonNull." into...

[automerger skipped] Merge "Mark StructNdOptPref64#prefix @NonNull." into rvc-dev am: 039d7960 am: 64ff01ee am: 6ad57c1f -s ours

am skip reason: Change-Id Ica4f6f7545e63e0665c2a4ae4de8323f3fd93e1c with SHA-1 5aa78eaf is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/NetworkStack/+/11167551

Change-Id: I9c73daf80aa39fdaae0c125eecea20f18627dc6b