[automerger skipped] Merge "Migrate away from AsyncChannel in NetworkAgent" am: abf3317103 am: 9156ffa5a5 am: bd646b30c1 -s ours

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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie47420e86dfe4aec19162545116023c9da75aa14
tree: 1b4161680100bab5d05b16f3372523469452dab5
  1. core/
  2. service/
  3. services/
  4. tests/
  5. OWNERS