Merge "Modify ServiceStateProvider for mOperatorAlphaLongRaw and mOperatorAlphaShortRaw"