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

Change-Id: Ia5e9f3e7ba7024151d0f4fa595bf66daaa0fc948