[automerger skipped] Remove usages of non-system API NetworkAgent methods am:...
[automerger skipped] Remove usages of non-system API NetworkAgent methods am: fc4abb03 am: c253911d -s ours am: 13247c9b -s ours
am skip reason: Change-Id I8c82db485d5d5f017c7e2f97b229956ff0ad9ab0 with SHA-1 913e04f3 is in history
Change-Id: I6d33a187bcd3b589fdf6a0d5cb78effa041cc663