Merge "WallpaperManagerCompat: correct build version check"