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 am: db26c254

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



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