Merge "Merge "Actually check for READ_PHONE_STATE permission for Voicemail query" am: 539f4f44 am: 5afc7541 am: b724c480"