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

Change-Id: I4d9ee486961326430fd6df3ba000584f5fec3a37