Merge \"Add properties and capabilities to GsmConnection after SRVCC\" into nyc-mr1-dev
am: 9f0c6f6137

Change-Id: I61b5f891b77d3cca07abe5fb856fefdc0cd5f775