[automerger skipped] Merge "Revert "Revert "[pm] remove old stage dirs on low storage""" into rvc-dev am: abe4e3849b am: a5599c23aa -s ours am: 6da1135a24 -s ours am: 5a8f464134 -s ours am: a16887fa37 -s ours am: 5cbb04e592 -s ours

am skip reason: skipped by user schfan

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

Change-Id: I8d593e068da1182ae3ea7c991b02b359f0566f1d