Merge "Test extra info sent to NetworkMonitor" into rvc-dev am: 8202b399da am: a4e00fbcd3

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

Change-Id: I78d12c6165478ddb5dfd8193534ae7c69350eeb4