[automerger skipped] Merge "Revert "Revert "[pm] remove old stage dirs on low storage""" into rvc-qpr-dev am: 8f9f44e025 am: 3a605eef32 -s ours

am skip reason: Merged-In I91170ba399b3a596320b3bd9c8188912e5c4f1be with SHA-1 50db8a56a2 is already in history

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

Change-Id: I4029e2c614e30dc6fccde03934c9c92af3f2aa6e