[automerger skipped] Merge "Revert "Revert "[pm] remove old stage dirs on low storage""" into sc-qpr1-dev am: cd4e3b6b -s ours

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

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

Change-Id: I6749e0874f748602cd9b6a0c5da86ff0bacad44f