ServiceManagement -> HidlServiceManagement am: fcaa97fe4e
am: 03abfc80a1

Change-Id: Id8e850d8c83434d128b92e6dd05954e55501f934