Merge "Fix a bug where a NetworkAgent gets repeatedly torn down"
am: a8452ed2a6

Change-Id: Ic37c9f60448b10c861a78848bed18ebd4e0ad910