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

Merge "Merge "[automerger skipped] Merge "Test extra info sent to NetworkMonitor" into rvc-dev am: 8202b399 am: a4e00fbc -s ours" into rvc-d1-dev-plus-aosp am: 51bfc92e -s ours" into rvc-qpr-dev-plus-aosp am: 6c5cc771 -s ours

am skip reason: Change-Id I4f827664c528bea30cc957a0a617dd37693f4460 with SHA-1 4d2791b1 is in history

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

Change-Id: Ibad172f0168ecd8ad0eba2d642efdedf57eef399