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

Merge "Ensure cleanup is called for the file pushed" am: a1355bc2 am: 0fc710ef am: 3a931422 am: 3db21541

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



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