[automerger skipped] Merge "Revert "Revert "[pm] remove old stage dirs on low storage""" into rvc-dev am: abe4e3849b am: 5de9fcd2c3 -s ours am: c46256dc24 -s ours am: ad44fa5865 -s ours am: 53103dfd12 -s ours am: 29a4db9c86 -s ours

am skip reason: skipped by user schfan

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

Change-Id: I580c7b705253eb57d0ffcfaf3c2a57ced081716f