[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 skip reason: skipped by user schfan

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

Change-Id: I7da1f0793b7a3925c4e407ed29e8b74db367b1ea