[automerger skipped] Merge "Test extra info sent to NetworkMonitor" into rvc-dev am: 8202b399da -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: I63ad698bb29d3770e879f27b155a9fc656a80836
tree: 83e1799959b5ec54b5258f87f6a48d9d53d9276d
  1. core/
  2. services/
  3. tests/