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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7aa23752ed86096651e122b8497180052fa16337