Merge "Fix wallpaper backup eligibility test" into nyc-dr1-dev am: 56ce19099d am: ad3f9a03ea
am: f4b8d26f9d
Change-Id: Iea622292cd7dc517b908a01caecafd9ffa17765b
This commit is contained in: