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

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

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

Change-Id: I047761d1254f30c349c66e6766ec886668ae85b3