Merge "add IncrementalManagerService to system server"