Merge "Don't use main handler in ImageWallpaperTest" into rvc-dev am: 6d2586f0 am: 2144dfcd am: 4038f9db Change-Id: Ia6b0c20abf3fd63d31b7b7e8540f188131a7e1c5