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

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

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