Merge "Revert "Skip DRM tests on watches since they don't have DRM."" into klp-modular-dev