Merge "AAPT2: Allow <key-sets> tags in AndroidManifest.xml"