Merge "Merge "Actually check for READ_PHONE_STATE permission for Voicemail query" am: 539f4f44c1 am: 5afc7541dd am: b724c4800f"