Merge changes I7a0845c0,I45ecbc86,I3d0203b7,I7cfc27ff

* changes:
  Refactor DataUsagePreference
  Refactor carrier settings
  Refactor CdmaApnPreference
  Refactor CdmaSubscriptionListPreference