Merge "Migrate away from AsyncChannel in NetworkAgent" am: 91348d9f22

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I29a9073fcd69953811d899d3b421624d21a81edb