[automerger skipped] Merge "Test extra info sent to NetworkMonitor" into rvc-dev am: 8202b399da -s ours am: 2b89a1680d -s ours am: 67a9005500 -s ours am: 7085cf6ac5 -s ours
am skip reason: Change-Id I4f827664c528bea30cc957a0a617dd37693f4460 with SHA-1 2153861f8e is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11862409
Change-Id: I1adb04c564663fbe4fb05af7411dd9289b1ff832
This commit is contained in: