[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: 757c074afe -s ours am: 99282557eb -s ours am: cc070ed4f8 -s ours

am skip reason: skipped by user schfan

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

Change-Id: I0b3e8d396d0c173cb4f4bac6793514fab3995bb1