Merge "Ensure DISCONNECTING state is passed to the InCallService on local...
Merge "Ensure DISCONNECTING state is passed to the InCallService on local disc." into rvc-dev am: 4097420b am: e40b5f9a am: 34bcaa39 am: 3acb75e8
Change-Id: I6063e13d941fc6197d16608bdbbab628f7baacca