Merge "ServiceManager: Internal renames"
am: 674c8b1b88

Change-Id: I068860211883602200250735efadafd0332226c8