[automerger skipped] Merge "Revert "Revert "[pm] remove old stage dirs on low storage""" into rvc-dev am: abe4e3849b am: a5599c23aa -s ours am: 6da1135a24 -s ours am: 778d92c775 -s ours am: 9972b3873f -s ours

am skip reason: skipped by user schfan

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

Change-Id: Ic9b2efb47a304c65a02204549a4cd8fbc37361c2