am 5fed49f7: am 4d9fcae2: Merge "Allow for a NoOp implementation of...
am 5fed49f7: am 4d9fcae2: Merge "Allow for a NoOp implementation of DrmManagerClientImpl" into klp-modular-dev
* commit '5fed49f7':
Allow for a NoOp implementation of DrmManagerClientImpl