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

Change-Id: Ife2ebc17cad34963fd7da223b9ccc3c21771cb60