Merge "Don't register AdServices as dumpable anymore." into main