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

Change-Id: Ia46c91c95fe0022fa1f3c66d98cf165a09151c9e