Move Carrier Preference out of Advanced

Bug: 71870678
Test: E2E
Change-Id: Iea814730f0bf886a613d4be8c1217db3454c37c9
2 files changed