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

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

Change-Id: If48de0d3fe326d72170b13ec6a9477dfc8dc48ff