Merge "Implement a NoOp DrmManagerClientImpl when no DRM service exists" into klp-modular-dev