[automerger skipped] Make most of NetworkAgent @SystemApi. am: 06c4c75100 am: cdf0dd26b9 am: 831f7eaa85 -s ours
am skip reason: Change-Id I856f01f02c35c2f6a886d8b98039e5dfbc48148b with SHA-1 631f33a68f is in history

Change-Id: I9d1f5297925972196fd8bb21afa58f5a1a12ddfd