Merge "Restrict access to background networks to CHANGE_NETWORK_STATE." into nyc-mr1-dev am: a703ecdd0c am: 57dd2e5eff
am: dc9bf7f516

Change-Id: Ib15c9ac54d9e493aea8fe5bb80d63356d33da137