[automerger skipped] Merge "Ensure that NetworkFactory objects cannot be...

[automerger skipped] Merge "Ensure that NetworkFactory objects cannot be reused." am: bfa98e96 am: fa6093de -s ours am: 14b65fa8 -s ours am: 296dabd3 -s ours am: c2384b51 -s ours

am skip reason: Change-Id I793436ee0f4b5d778788ad34b8a2575d2ad0ed80 with SHA-1 f1080a9a is in history

Change-Id: Ia80519b477cb99c0c7c0e84e1c7b967570e9efce