Merge "[Settings] Refactor CarrierPreferenceController" am: 985352d172
am: a0d1887a98
am: 0cd7089858
am: 091f6b0339
Change-Id: If6bdb63fc3f7ef69ee6c96e4669363fe3e865eee
This commit is contained in: