I don't think we ended up in a place much better off from a freedom perspective.
Android is a little better because parts of it are open. Google has been steadily moving things into play services though, which is not open. There is now an open source replacement for play services - I don't think it's very compatible yet though.