[automerger skipped] Merge "Updates to NetworkFactory for the new NetworkAgent constructor" am: e5dd2ee84d am: 7fa00f8fbe am: c113e450d8 -s ours
am skip reason: Change-Id If327cf0ffd917f9cb358f9ed3779da58fce40ef8 with SHA-1 44ca947467 is in history

Change-Id: Ic3116800e3ab8d574682928e81509ea66b06b88e