Merge "Add /metadata info on dumpsys diskstats and StatsPullAtomService"