Merge "Check for dump permission before other permissions." am: f8af6922 am: c046c890 am: b4e882bf Change-Id: Ia46c91c95fe0022fa1f3c66d98cf165a09151c9e