Revert^2 "Dynamically stop services with multiple interfaces"

37f70cc1029e8e984e60f485db59d6e6889cbb1b

Reason for revert: This undoes the previous reversion, which was made to fix b/148282665.

Change-Id: Ie855de284969af5dc937dc95daae84c3df107d32
3 files changed