Merge "Reinstate CHANGE_NETWORK_STATE as a normal permission." into mnc-dr-dev