am fda42e24: am ef7adeef: Merge "Revert "Also Skip DRM setup on devices that...
am fda42e24: am ef7adeef: Merge "Revert "Also Skip DRM setup on devices that don\'t have DRM"" into klp-modular-dev
* commit 'fda42e24':
Revert "Also Skip DRM setup on devices that don't have DRM"