Merge change 5344 into donut

* changes:
  frameworks/base: CDMA voicemail support