[automerger skipped] Merge "Add MANAGE_TEST_NETWORKS to system API" am:...

[automerger skipped] Merge "Add MANAGE_TEST_NETWORKS to system API" am: 2a0f125d am: 6c750383 am: e431563a -s ours

am skip reason: Change-Id I9f41f888fbd4b7605d750110b345005a5cba85d1 with SHA-1 0d00aef6 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie0fd240132b5acbe161ccf6cdae07c1d39109b8e