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 sc-qpr1-dev am: cd4e3b6b -s ours am: 63f5f480 -s ours" into sc-v2-dev-plus-aosp