Merge "Reinstate CHANGE_NETWORK_STATE as a normal permission." into mnc-dr-dev am: 809dcade99
am: bdc458048a

* commit 'bdc458048abee78a945a26cd13a71245e7d4a2e5':
  Reinstate CHANGE_NETWORK_STATE as a normal permission.