am c2fc52dc: Merge "Add aapt support for implicitly-granted permissions"

* commit 'c2fc52dc9ce8728bcd1c2b4d82ee573fa7f5049b':
  Add aapt support for implicitly-granted permissions