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

Change-Id: I3d9a11d55ff53e3c6a32e8f16782024006d992b7