You are right, Google did not intended Android to be a move against Apple from the start, this happened later after iPhone release.
I am also remembering about some emails between Steve Jobs and someone at Google but I can't find them, anyway Google is paying a ton of money to Apple to be set as default search engine, if Apple gets a bigger market share then Google will have to pay even more.