am 940f8be3: Merge "Implement a NoOp DrmManagerClientImpl when no DRM service...
am 940f8be3: Merge "Implement a NoOp DrmManagerClientImpl when no DRM service exists" into klp-modular-dev
* commit '940f8be3':
Implement a NoOp DrmManagerClientImpl when no DRM service exists