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

Change-Id: I3edc03759d6fb9b1a38f554daf2ce6b2b65861df