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

Change-Id: I831feb95c020929e8e8f5df646746686d989e30d