Merge "Add /metadata info on dumpsys diskstats and StatsPullAtomService" am: 31f779f949

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1993550

Change-Id: Iebb35e4099506f05f73c59dd689e84e75ae8756d