Merge "Use `PushFilePreparer` to push files in OverlayDeviceTests"