Merge "ActivityManagerService: add restricted cpuset" into pi-dev