Merge "Fix wallpaper backup eligibility test" into nyc-dr1-dev
am: 56ce19099d

Change-Id: Ie050c1b69d4692c828ad41e6c0f32fb6e89084f6