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

[automerger skipped] Merge "Revert "Revert "[pm] remove old stage dirs on low storage""" into sc-dev am: 3b1c05a7 -s ours am: 4e3c94cd -s ours

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

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

Change-Id: Idda9eda686364616fc68433ee03590aa7f0a7489