Merge "Update the currentCalls before VTS notification."
am: f0796fd497

Change-Id: I6c5748081b255d2b38e51aa285f60a786d72383a