am 85bb9056: am 7d167181: am 0aeca872: Merge "Make setting PAC require CONNECTIVITY_INTERNAL" into klp-dev

* commit '85bb9056fc3eaf7eeb826041eb030c13bd9e3e16':
  Make setting PAC require CONNECTIVITY_INTERNAL