Merge "Add share activity to manifest and move file provider string (AOSP)" into nyc-dev