[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-v2-dev am: d2714d90 am: b49d010f -s ours

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

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

Change-Id: Ide88e3402b242dc6f5ebc8829baf3ed99f6f2b7d