Macbook 87w USB C Charger Recurring Issue

So almost since I bought my Macbook about 2 years ago (2016 15inch MBP with touch bar) I've been having these weird issues with my charger. It would randomly stop working, then when I take it to the Apple store it would magically start working again.

Recently I went on a business trip to Hong Kong and had the issue there again. I couldn't get it to charge my macbook any more. I did however notice that if I pulled it out of the wall, and plugged it back in, that it would start charging for about half a second then switch off.

So I got my brick replaced at an official Apple store. The guy there said there's most likely some kind of shorting issue in the brick. The new brick worked well, untill today, 3 days later. Now I'm having the exact same issues again. Charges for half a second then switches off. If I just unplug and replug the usb c cable, it doesn't happen, only if I unplug it from the wall socket, or unplug the cable that's going from the wall into the brick.

Any ideas what the issue is? Maybe it's software related?