[automerger skipped] Merge "Update the currentCalls before VTS notification." am: f0796fd497 am: 2f055676a0 -s ours
am: 827dd5f535 -s ours
am skip reason: change_id Iee9e18149397c39b7c84ec1dc570b9bac7142eb6 with SHA1 fcd55caafd is in history

Change-Id: I3069e4d6301b2680136e6060798e87d91c622a0e