Merge "AAPT2: Allow <path-permission> tag in <provider>" into oc-dev