Merge "[automerger skipped] Merge "Test extra info sent to NetworkMonitor" into rvc-dev am: 8202b399da am: 00bec70ace -s ours" into rvc-d1-dev-plus-aosp am: 0d7c5b2fa8 -s ours
am skip reason: Change-Id I4f827664c528bea30cc957a0a617dd37693f4460 with SHA-1 593f1e8176 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11862409
Change-Id: Ia59f937086c386b22c727aef90099af62229d012
This commit is contained in: