DO NOT MERGE Adjust WALLPAPER_RECONNECT_TIMEOUT_MS in WallpaperManagerService to 15s am: a686345759
am: a399705286  -s ours

Change-Id: I654fc19afef7f11d894590d287cde3650b8252af