Merge "Move servicemanager into system-background cpuset." into nyc-dev
am: 62b6bc7

* commit '62b6bc7c8c5e5016f575955dab147f70f8b8cc0a':
  Move servicemanager into system-background cpuset.

Change-Id: If74176c4e20082988f0df33869d881fc051e1129