Merge "Use `PushFilePreparer` to push files in OverlayDeviceTests" am: 1c6932c66e am: 2e10f3d671

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2166923

Change-Id: Ie8d97d78d2d7379a17598f0c50f6a8d7ef1bc747
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>