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

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

Change-Id: I4775333d32067e651a2a47148a376e1400b8ba1e