Merge "bringDownServiceLocked() shouldn't complain when mServicesByName..." into oc-dev
am: 1f1d372524

Change-Id: Ide5cfde6d0f8982c0fa51f6f8e10f1ce7a65389e