Merge "Test extra info sent to NetworkMonitor" am: 4f45ccd46b am: dbcfe36229

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

Change-Id: Ice048df853589411ee1f1c935b929994af1c525b