[automerger skipped] Merge "Migrating remaining core networking tests to Junit4" am: 96dbac0c5c
am: a3c2022836  -s ours

Change-Id: I7df578d4f89b94e50d9f3798fc675b6a93477200