Merge "Rename ACTION_VOICEMAIL_SMS_RECEIVED" into oc-dev
am: dfbc8517ee

Change-Id: I346365749cc6309cb1f2905f91ea9bac143519f0