Check network type before clearing primary timer

Only clear the timer if both the data network type and override
network type are the same. Prevents the bug where the primary timer
is cancelled when the device changes from connected->legacy states
due to NR->LTE data network change.

Test: atest NetworkTypeController
Test: manual test
Bug: 320266691
Change-Id: I499a93c0738163b4d93460f4df2acdf477980332