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

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

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