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

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

Change-Id: I31148f60e0d078347ab7d2dc263bdbc03def5fd7