Merge "[2/3] Remove unnecessary throws statement in ServiceManager"
am: 3ba482971b

* commit '3ba482971b0f1709520ba9713fb11ac4727559c4':
  [2/3] Remove unnecessary throws statement in ServiceManager