Merge "Persist SRVCC-related properties in GsmConnection" into nyc-mr1-dev