Merge "[Multi-user] Change ActivityManagerService to use userId."