Merge "Add aapt support for implicitly-granted permissions"