Merge "Manually calculate stats for app owning external storage" am:...

Merge "Manually calculate stats for app owning external storage" am: 26c6a3e0 am: 12d72841 am: 74bb5242 am: a3b4152e

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

Change-Id: I67d225a858e9b1136f9d9d7ab8f00a71637ab190