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