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

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

Change-Id: Id7d21107af67a42efb74e20298417a2aa1361ec7