Merge "Ensure cleanup is called for the file pushed" am: a1355bc271

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

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