[automerger skipped] Merge "Migrate away from AsyncChannel in NetworkAgent"...

[automerger skipped] Merge "Migrate away from AsyncChannel in NetworkAgent" am: 91348d9f am: 2652fbda am: 4d4aa881 -s ours

am skip reason: Change-Id Ie364ab50f416e7821e70f4539a881eea828e1256 with SHA-1 fb9c6e8d is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie47420e86dfe4aec19162545116023c9da75aa14