[automerger skipped] Merge "Use updated NetworkEventDispatcher API" am:...

[automerger skipped] Merge "Use updated NetworkEventDispatcher API" am: 824ac591 am: ddcabfd5 -s ours am: ee2a8870 -s ours

am skip reason: Merged-In Ib5ea04b0bae0dce9783c4017f1dd0db0efd49976 with SHA-1 a0ce8ac4 is already in history

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

Change-Id: I945e894c27c65fdc187785098f2666b50551357b