[automerger skipped] Merge "Fix dangling NetworkAgent" into sc-dev am:...

[automerger skipped] Merge "Fix dangling NetworkAgent" into sc-dev am: 465da826 am: 50551f73 -s ours

am skip reason: Merged-In I84cd43a0c136662f5c2d229650f1f5f889e6f144 with SHA-1 7207a83c is already in history

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

Change-Id: I0cccd955867196b747e60acda275e4783555ae1f