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