Merge "Merge "Update the currentCalls before VTS notification." into qt-dev...
Merge "Merge "Update the currentCalls before VTS notification." into qt-dev am: 41605f08 am: 91b8021e" into qt-r1-dev-plus-aosp
am: 6c1b2fed
Change-Id: I768752573518892341e63a98eb722a39872335b5