Merge "Retain allowBackup annotation when system+lock wallpaper becomes lock only" into nyc-mr1-dev