[automerger skipped] [NS02.wf] Adjust tests for changes to NetworkFactory am: 72c17300a2 am: cb57aa7a1c am: 5dc0a3c26d -s ours

am skip reason: skip tag Change-Id I361f9614d28ed6c41581f239208e16b75a363559 with SHA-1 b7a5390648 is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Wifi/+/1640159

Change-Id: Icae8c7a33b499c734c6c4747a637a38de0273a08