Merge "Revert "DrmManager: check drm.service.enabled in init"" into sc-dev