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

Change-Id: I7d47b6c065f45edeecf3fd5df133545dad561d0f