Merge "Merge "Update the currentCalls before VTS notification." into qt-dev am: 41605f08e7 am: 91b8021e56" into qt-r1-dev-plus-aosp am: 6c1b2fed17
am: 797edb06f7

Change-Id: I1df008822a1b0887082e243b985037cc6c1be329