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

Change-Id: Ide554d628c5b68bad064bf156c8f9edf75db3fd2