Merge "Manually calculate stats for app owning external storage" am: 26c6a3e0f6 am: 12d7284145

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

Change-Id: I8144be93377c4426fbfc622e1f215c67b1528daa