Merge "Use new preferredAPN URI avoiding onApnChanged() call with self-change" into ics-mr1