Fix VoLTE configuration on secondary TMO MCC/MNC.

Added in ag/573693. But underlying mechanism changed in ag/573692 and
not adjusted.

Change-Id: I2e4784df38ba35aec477d657753974b7918b08b0
17 files changed