[automerger skipped] Merge "Test extra info sent to NetworkMonitor" into...

[automerger skipped] Merge "Test extra info sent to NetworkMonitor" into rvc-dev am: 8202b399 am: a4e00fbc am: 702c4e7a -s ours

am skip reason: Change-Id I4f827664c528bea30cc957a0a617dd37693f4460 with SHA-1 2153861f is in history

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

Change-Id: I5fdebc339ea29f89fc07eb5d7843db24f27d23cd