Merge "Add function CleanupOldScratchFiles symmetrically" am: 2e5e490d60 am: c7a2eb6388 am: b846cd648c

Original change: https://android-review.googlesource.com/c/platform/system/core/+/1682488

Change-Id: Iced997fe9f51742ed17044ab3d97857a1e3f21ec