Merge "Fix a bug where a NetworkAgent gets repeatedly torn down" am: a8452ed2a6 am: 806f0191d4
am: 16897eb4aa

Change-Id: I06a64bbfaa501f860d7078cb2cc6d9af60b57eb8