Speaking of Android O, Sony should actually be the granted one to have the first smartphone released with Android O, and by first, I mean totally the first phone, a non-Google phone.
They have contributed a lot to this OS in general, mostly the audio functions that Xperias always have for all these years.
Not only those, but I wanna mention the 30 feature enhancements and 250 bug fixes to the overall OS - those things are more valuable than Samsung-added features except Split Screen (which is the only good feature that Samsung has implemented to Android).
Definitely im going to buy Nokia but i wont buy Nokia 3, 5 or 6 .. i will wait for successor to Nokia 6
If they also get android P, they have a key selling point, which isn't the case at the moment