[automerger skipped] Merge "Migrate away from AsyncChannel in NetworkAgent" am: c9c51b665d am: 39364945d5 am: efb9125a7f -s ours

am skip reason: Change-Id Ica51d0179bcb3b4e314d2c3e85709aead6ca5657 with SHA-1 afe26600fb is in history

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1484018

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ifc7f85c3b4a67ff96fafbace6c9dc02b799cbe32