Merge "Modify TestApp to use new indication for SRVCC"
am: 66ebe3fe8a

Change-Id: I5665cfeeb9b2856651fc89965d865f0194041dba