Android has been using mainlined for a few kernel revisions now.
The Android Mainlining project continues to trudge onward, it's not complete. There's a decent chunk of stuff sitting in staging as well that hasn't been accepted by mainline, but still more that hasn't even gotten to staging. There's also a few things where mainline rejected Google's version and provided an alternative, but Android was never changed to use the new thing (Alarms/Timers fall into this case)