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

Change-Id: I8fa53ac5143bd5df0177a11e5961acef63072007