[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 rvc-dev am: abe4e384 am: a5599c23 -s ours am: 6da1135a -s ours am: 5a8f4641 -s ours

am skip reason: skipped by user schfan

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

Change-Id: I1bdb26f99db6aabb5f2096b83fc941cd589712b8