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

Change-Id: I16df45f469693e0103c2c222bd93b9f5c0d7958b