Merge "Added permissions for the dumpstate service."