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