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: d67e9472 am: 6f8c4f16
Change-Id: I791712c990f1483c4a3cb6584c89bb85f149aa38