Merge "To remove drm service from groups of "system" and "root"."