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

* commit 'a46fa4416cf438c956e4dbd733fe2a62cf72af79':
  Also Skip DRM setup on devices that don't have DRM