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

Change-Id: I768752573518892341e63a98eb722a39872335b5