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

Change-Id: I5ebed04800d3acf758787067b63bca50fa957649