[automerger skipped] Merge "Test extra info sent to NetworkMonitor" into rvc-dev am: 8202b399da -s ours am: c3a780339a -s ours

am skip reason: Change-Id I4f827664c528bea30cc957a0a617dd37693f4460 with SHA-1 301bc7b40a is in history

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

Change-Id: Iad71a237e3bac6340747e86a77c5569fea0bfb42
tree: 83e1799959b5ec54b5258f87f6a48d9d53d9276d
  1. core/
  2. services/
  3. tests/