Merge "Improve error handling for register/unregister ntn signal strength related APIs" into main