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

Change-Id: I2066d699def9e921df3a2fd12a709a01b5e7795a