Merge "Update string for failure to add call due to ongoing VT call." am: afa2e7713c
am: 99c49d9b64  -s ours

Change-Id: Ie0ee9ee82fb3075abe2872f426fab01f2e2dbcab