Merge "Revert "Creates an Android.bp with prebuilt_etc for permission XMLs."" into sc-dev-plus-aosp