Merge "Add activity, file paths and fileProvider to manifest (AOSP)" into nyc-dev