Consolidate permissions to get WhatsApp working

This should just be a temp fix until WhatsApp get their butts in gear
Change-Id: I993013eafedb8a733f2b74d3dca38f35879492dc