Merge "ATest: add metrics of inconsistent device permissions"