Merge change 5329 into donut

* changes:
  frameworks/base - CDMA settings additions