Merge "Merge "Ensure DISCONNECTING state is passed to the InCallService on...
Merge "Merge "Ensure DISCONNECTING state is passed to the InCallService on local disc." into rvc-dev am: 4097420b am: e40b5f9a am: 4af0d938" into rvc-qpr-dev-plus-aosp am: cb0ebe72
Change-Id: I72d6b5f120d0b417e8ed6a387b33ec8c7f674095