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

* commit '4f1563fa129157e407a223eb13ab382d1d45483b':
  atrace: introduce category for core services

Change-Id: I19a16cd1219ed757d8a394d7385d4254a9b25673