Merge changes from topic 'am-caa9190d4d3243e3bd21c7d512d1026a'

* changes:
  Augment diskstats dumpsys to have categorization and apps. am: 090b2d9d am: f1312cd6
  Add a file collector to the platform. am: be770dce am: a9d86027  -s ours
  Merge "Add an app size collector." into nyc-mr2-dev am: 8fd55702 am: 9bd20ab6
  Add an app size collector. am: c7d9de59 am: f5e2f1ae  -s ours