am 170bfe32: am 7b6231a4: am aba79851: Merge "Use new preferredAPN URI avoiding onApnChanged() call with self-change" into ics-mr1

* commit '170bfe32ab8971805d56f8870758cbc46060d1ef':
  Use new preferredAPN URI avoiding onApnChanged() call with self-change