Merge "Allow for a NoOp implementation of DrmManagerClientImpl" into klp-modular-dev