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

Change-Id: I854846a6033dd17228563c7801060f1faabf761e