Merge "Check for dump permission before other permissions." am: f8af692214

Change-Id: I2724cd33d88cf8a75133f0dde46363f7c7721ccc