Merge "Fix wallpaper backup eligibility test am: f7d1b5de6e" into nyc-mr1-dev
am: e022290806

Change-Id: Ib016b9731e1efa1980112ed2d38e8553ff0973d0