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

Change-Id: I17b081e141f6e634f3c6ef6c9a8b7928db8e2753