[automerger skipped] Make most of NetworkAgent @SystemApi. am: d60481ce20 am: 940b91d9d5 am: ab1fcfae8c -s ours
am skip reason: Change-Id I856f01f02c35c2f6a886d8b98039e5dfbc48148b with SHA-1 980ed12f7f is in history

Change-Id: I9d1f5297925972196fd8bb21afa58f5a1a12ddfd
tree: 477c532ffbf3e875e4ddfd9ec6695bc7f243456c
  1. core/
  2. services/
  3. tests/