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

Change-Id: I258cec0012787532b7bdcdbac6fecacd5a2cd33b