[automerger skipped] Merge "Test extra info sent to NetworkMonitor" into rvc-dev am: 8202b399da am: a4e00fbcd3 -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: I7a0a49a16ce67ddcf86ea6ad4d7ccda9f15181e9
This commit is contained in: