Merge "Reinstate CHANGE_NETWORK_STATE as a normal permission." into mnc-dr-dev...
Merge "Reinstate CHANGE_NETWORK_STATE as a normal permission." into mnc-dr-dev am: 809dcade am: bdc45804 am: bb8f6523
am: 8ecad265
* commit '8ecad265':
Reinstate CHANGE_NETWORK_STATE as a normal permission.