Merge "Fix a bug where modern network agents start in UNKNOWN" am: fc2b39948c am: 63b234d158

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

Change-Id: I1acdfe14a14bfca15967efe2d97b653691e259f8