Merge "ColorDisplayServiceTest fix: adding missing DisplayManagerInternal service" into udc-dev