Revert "Also Skip DRM setup on devices that don't have DRM"

This reverts commit 4565d632f59f13c94c5c70c6e08fb190e08a4bbe.

No longer needed, for explanation see:
bug: 15110978

Change-Id: If0a868b5893046aec323c376a60070303960442c
1 file changed