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

Change-Id: I7c426e4e8eb6187d044069c577ae68b1af41ea1e