Merge "[automerger skipped] Merge "Revert "Revert "[pm] remove old stage dirs...

Merge "[automerger skipped] Merge "Revert "Revert "[pm] remove old stage dirs on low storage""" into rvc-qpr-dev am: 8f9f44e0 am: 3a605eef -s ours am: 19264a6b -s ours am: 8b8e613c -s ours" into sc-v2-dev-plus-aosp