Merge "Fix constant name in WallpaperManager javadoc." into nyc-dev