Merge "DO NOT MERGE Adjust WALLPAPER_RECONNECT_TIMEOUT_MS in WallpaperManagerService to 15s am: a6863457 am: a3997052 -s ours" into oc-dev