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