Merge "Merge "Don't use main handler in ImageWallpaperTest" into rvc-dev am: 6d2586f0 am: fcf65435" into rvc-d1-dev-plus-aosp