Merge "activity_manager: use waitForService instead of getService"