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: db6e834a

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



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