Merge "Add MANAGE_TEST_NETWORKS permission as @hide" am: 96f51fd970
am: 7a66b02e62

Change-Id: I1999d3c8c517f3f1369005b986f18105ef793dab