Merge "DrmManager: check drm.service.enabled in init (2nd attempt)" into sc-dev