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

Change-Id: Ic283c247bbb5b62f9816cf074abd1fbeb5778cd4