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

Change-Id: Ief20f7e5e0042e551a9c9ae605abe0c6fce46e6a