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

Change-Id: I1e985d5704b8da225eb408bd113b17f958b1bb59