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

am: 8ecad265b6

* commit '8ecad265b6db57f78dd142e974057c91f69489ed':
  Reinstate CHANGE_NETWORK_STATE as a normal permission.

diff --cc core/java/android/net/ConnectivityManager.java
Simple merge

diff --cc core/java/android/provider/Settings.java
Simple merge

diff --cc core/res/AndroidManifest.xml
Simple merge

diff --cc services/core/java/com/android/server/ConnectivityService.java
Simple merge