Merge "Per user, per storage type cleanup to match PM behavior." am: 7468714189 am: 85f3d515f4

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1985347

Change-Id: Iacdd2edb3029498b6a599a6c80b8770850a8708b