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

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

Change-Id: Ife44a25c5e752b4785fe8d634e937c739812a846