Revert "Dynamically stop services with multiple interfaces"
am: 37f70cc102

Change-Id: I2abcb3d8142e4e089069afa7bc4647169a7f7149