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

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