Toggleable services check vintf specifies toggled. am: 51fbeaacc4 am: 089de3105b am: f6dc2d32c3
am: cc8003e2df  -s ours

Change-Id: I4ebb7900f1774d3f56073fe83ab79d8d67b7dc36