Get the correct operator name

If the long operator name is not given by RIL,
try to get the short operator name.

Bug: 32791744
Test: Extended ServiceStateTest.
Depends-On: commit in frameworks/base with the same Change-Id
Change-Id: I4983ad708c57a650ce4a806e1f53837825bad2db