Advice After Redirecting AMP URLs

So. I recently disabled the AMP plugin after a day of use due to it not being compatible with many of my other plugins.

But then, I noticed a large number of 404 errors coming from google searches. Turns out all my URLs that are ranked on google had /amp/ at the end of the URLs. (AMP was by then disabled but the links still had /amp/).

Therefore, I had to redirect every single post to its original (non-amp) URL. It was about 80 posts and took a while which annoyed me to say the least. After all AMP doesn’t tell you about this potential problem when disabling the plugin and it can have a very negative impact on SEO.

So, now that I redirected the pages, everythings working again.

My main question to the experts is: Will google automatically change the /amp/ URLs from search results and replace with my redirect URLs?