Convergence devices have a long history. I read in Steward Brand's 1988 book, The Media Lab, about devices that would converge, collect the functions of our small electronics. Xerox PARC was starting on ubiquitous computing and "pads, tablets, and slates" in the timeframe.
A 30 year progression has brought that old dream to hundreds of millions, who just call it a "phone."
I have a hard time seeing the long history in terms of just one brand, or even a few. The trend is much bigger.
I actually like the confusion of the Android market, but I chose a purely conforming Nexus for myself.
Still I like an ecosystem that is really that, and Xiaomi contributes to diversity, even if I don't buy one.