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

Change-Id: I23b9aa64172ffd8a2f48e4355f5745567536b9a7