am 5aff3b54: Merge "Maintain call time across SRVCC (2/3)." into mnc-dev

* commit '5aff3b5489262ccff4b6f9e18e0d990ebfe4d7bc':
  Maintain call time across SRVCC (2/3).