Merge "Make allowBackup of MediaProvider false" into nyc-mr1-dev