[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: 5de9fcd2 -s ours am: c46256dc -s ours am: 757c074a -s ours

am skip reason: skipped by user schfan

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

Change-Id: I9aa4a245e1e41df2370c83d7a488f905b57a9b17