Set Data SPN to SPN when not overridden

In order to allow applications to either always display
the SPN or the data SPN in various contexts, override
the Data SPN when it isn't otherwise provided.

Bug: 358669494
Test: atest CarrierDisplayNameResolverTest
Test: manually verified voice/messages/calling on Akita
      on P80481885 == AP3A.240905.013 + ag/29194106
Flag: EXEMPT bugfix
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:b879f6825cb4361b6459f9840ada80364d81593c)
Merged-In: Ia8353a8c4035898ce524ae76157ef2637fb68aa9
Change-Id: Ia8353a8c4035898ce524ae76157ef2637fb68aa9