Merge "storaged: add permissions for dumpstate" am: 611202ef53
am: 702605c62f

Change-Id: I23b987ecccce6e9622b0e7844d00c14f6ef4d21b