Chinese developers represents the largest market in the world now so if these countries want to earn money with their apps, they'd better make a version for the OS of the Chinese market.
But that's my take. According to your take, what is the correct solution for China/Huawei?
I would portray Apple, Google, Amazon, Microsoft, Cisco, Yahoo, Twitter, and Facebook as security risks for being data collection agencies on you either for profit or for the US. Then I would sell the new Huawei product as secure. This may work only on Russia and BRI regions, but other than that, the world is heavily dependent on Google, Microsoft, Apple and Facebook services.
This would virtually split the tech world in half, or two thirds to a third. There is already a Great Wall of tech between China and the rest of the world when it comes to services (Alipay, QQ, WeChat, Weibo and so on, versus Facebook, GMail, YouTube and so on.) The sad part is that US tech companies are not belligerent to China and are looking to invest or set roots there, such as Facebook. Google ain't banned in China by the way, and they operate some research centers in China, plus they also collect ad revenue there. I honestly don't like this but this is where it might be heading into. I am not really fond of throwing the baby out with the bathwater strategies either.
Losing Huawei is already a massive blow to Google, and Huawei has been a strong counterbalance to Samsung's dominance of the Android ecosystem. Google and Samsung has their own ongoing feud or rivalry for Android dominance, hence why Google makes Pixel phones. Losing Huawei would cost Google hundreds of millions each year. The US also loses too, as one less Huawei device is one less device for Facebook, WhatsApp, Instagram, Twitter, and all the US apps in the Play Store. These devices are a Win-Win all for both sides and losing them is a lose-lose all.
The low razor thin margins on smartphones should suggest that even to Huawei, this shouldn't be your future, and even Samsung is quietly moving away from that. Samsung made more money selling displays and memory chips to smartphones than selling smartphones. Huawei should do the same --- selling components to other smartphone makers. Don't care about OS or Android, just get HiSilicon chips inside your Oppo, Vivo, your OnePlus, Motorola and Xiaomi. You would make more money that way. Huawei should take its smartphone division and sell it, or spun it off into an independent unit. When a company is doing too many things, it also loses focus and the rot sets in, which is the fate of too many US companies.