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