Revert "Move Carrier Preference out of Advanced"

This reverts commit 3f10321d27ab28489efb5d41a4bfc3913af57902.

Reason for revert:
UX decide to revert this.

Change-Id: I1780e06369f7cd90e0bbd5ed94d21dc77b2574ea
2 files changed