I found a solution that worked on my Note 5. Hopefully it will help someone else in the future that has their phone get stuck in UPSM.
Click on the app drawer, drag the Google app up to the top of the screen where it says "app info", click on "More" at the top right, uninstall updates. Once I...