[automerger skipped] Merge "Revert "Revert "[pm] remove old stage dirs on low storage""" into qt-dev am: 1023ace074 -s ours am: 267120cdec -s ours am: 907512b03f -s ours am: 54d94a99a0 -s ours am: eee7297df5 -s ours am: 5c668427f6 -s ours

am skip reason: skipped by user schfan

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

Change-Id: Ifb0190f5ba944285503c965c2d1a8a3985d16cc3