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

* commit 'cb1504ae086dd1394e06d4b161b2b327d807eaff':

Change-Id: I838b7c38017f3985c008eb97c61292e5eecf4c25