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

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

Change-Id: I7768b0695f6139bdeb9ed175ef8b19cdcb6474f9
Signed-off-by: Automerger Merge Worker <[email protected]>