edgeEffectType is an S feature and must be moved.

Bug: 179451402

edgeEffectType was initially added as an S feature in master,
but not in sc-dev. This has been added as an S feature in
sc-dev and this CL moves it to an S feature in master.

IDs now match sc-dev.

Test: EdgeEffectTests
Change-Id: I45f8f5a8be3b2875530ac3c471f77b518db16f89