[automerger skipped] Merge "Revert "Revert "[pm] remove old stage dirs on low...

[automerger skipped] Merge "Revert "Revert "[pm] remove old stage dirs on low storage""" into rvc-dev am: abe4e384 am: a5599c23 -s ours am: 6da1135a -s ours am: 778d92c7 -s ours am: 106eee69 -s ours am: 6401d9cd -s ours

am skip reason: skipped by user schfan

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

Change-Id: I07ea9c4c30ff3719e40e49190335bd9429a676fa