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

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

Change-Id: I9a6b1bbb4e0bfa9e902add0476aaa44d40d5198e