Merge "Fix iterator in ServiceManager::removeCallback"
am: 73f4c61ceb

Change-Id: Ief4d84c9bdd9227642af7d295b6798642fd7533c