Merge "Rename ACTION_VOICEMAIL_SMS_RECEIVED" into oc-dev
am: 9370f24e80

Change-Id: Ifdf846bd33eefa37bb754bd0a8a8f5d0f7668c52