Merge "WallpaperManagerCompat: correct build version check"
am: 8ef0aff593

Change-Id: Iece01a396a035d6ab3ca6dfb2dd623e2f23fc7a0