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

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

Change-Id: I0fe8899299577c8b2b8381e4ea385fd982c74eb7