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

Change-Id: I25f687dc7d87efd1da1bac45722b5581b0fe0683