Unlikely now, but the writing has been on the wall since "Android Market" became "Google Play Store" and feature after feature has slowly been migrated from AOSP to GMS over the years. The frog continues being brought to boil, and the inevitable will eventually happen.