Merge \\\"Turn down factory-default lock wallpaper support\\\" into nyc-dev am: 52e323bd38 am: f252ef9ec1
am: 2e2dbd10d6

Change-Id: I10398d971c6fdfad1c5d0eba0f6ebd814eded8c8