Merge "atrace: introduce category for core services" into nyc-dev am: 4f1563fa12
am: a6d385eb75

* commit 'a6d385eb75c459ceb291c089e38d8cf684c02965':
  atrace: introduce category for core services

Change-Id: I17b8a748b14a2dfea4a5b4133bafe87261a2890e