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 rvc-qpr-dev am: 8f9f44e0 am: 3a605eef -s ours am: 19264a6b -s ours am: 8b8e613c -s ours" into sc-v2-dev-plus-aosp am: 975f6fed -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/+/16056948

Change-Id: Ie25d04a85c3cbcdb1827ba726526e12511e800a3