[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: 54d94a99 -s ours am: eee7297d -s ours am: e2f89348 -s ours

am skip reason: skipped by user schfan

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

Change-Id: I898032afc41638d2936ebbfd65e73dc2943cd3f5