Refactor CarrierPreferenceController Bug: 150352656 Test: make Change-Id: I8b125eb501cdbf63cbfa84d72d78e44a655bf9a5