Merge "AAPT2: Added badging and permission"