[automerger skipped] Merge "Revert "Revert "[pm] remove old stage dirs on low storage""" into qt-dev am: 1023ace0 -s ours am: 267120cd -s ours am: 907512b0 -s ours am: 06cc422e -s ours am: 86f77ecc -s ours

am skip reason: skipped by user schfan

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

Change-Id: If1b38f0af9b9f80ad04b09bf7a1952443b3f780a