Merge "Document that this ResolverActivity isn't directly used." into udc-dev