[automerger skipped] Merge "Revert "Revert "[pm] remove old stage dirs on low storage""" into rvc-dev am: abe4e384 am: 5de9fcd2 -s ours am: c46256dc -s ours am: d3198067 -s ours

am skip reason: skipped by user schfan

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

Change-Id: I2dafe4dc3b800e045c6c357dbee67c81e0f1601c