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

Change-Id: I90a78faffa4a4d61f8e3dcf6040baaa48f435df5