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 am: fb1ca079 -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/+/15960214

Change-Id: I64a31b99dcfa52f7fcf9e684a1d5f5ed5036a574