Merge "Mark several NetworkAgentInfo members @NonNull and address TODO." am: 61209f8504

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1552502

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I904873d1998948ef58e6179a78c5d87834fa7c86