Merge "Remove legacy network factories" am: 2e2dda5a9f am: 3ca0462c2b

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1574684

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If74d226cc09ea1f1b1a70423084fbd018dba2e63