Merge "Check system & lock wallpaper backup eligibility independently" into nyc-mr1-dev
am: dd59a27f2e

Change-Id: I9b1f2951d80832182afb11e87a9e56acb80a302b