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

Change-Id: I19fae35338016bbbb7de07e8c9d978bab2e088fe