[automerger skipped] Merge "Test extra info sent to NetworkMonitor" into rvc-dev am: 8202b399da -s ours am: 32a83a3ef7 -s ours am: 44f754326a -s ours
am skip reason: Change-Id I4f827664c528bea30cc957a0a617dd37693f4460 with SHA-1 0f6aeff137 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11862409
Change-Id: I3e98eecb7de50eea0bb57bf62cb5201fac7c065d
This commit is contained in: