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

Change-Id: Ic37c9f60448b10c861a78848bed18ebd4e0ad910
tree: 66c7e5cd5f335edc110a5193f44825efebdb4fc2
  1. core/
  2. services/
  3. tests/