Merge "Require READ_PHONE_STATE for getNetworkType"