Merge "DisplayManagerService: remove unused support for onlyCore mode"