Revert "Don't start intelligence services that are not provided by the OEM."

This reverts commit c6fff252.

Reason for revert: causing WM pre-submit tests to fail on go/wm-tests

Change-Id: I7a6db671f17fb056f29d5e02f58a7da88afda7ed