Merge "Rename CallStateException ERROR_DISCONNECTED to ERROR_OUT_OF_SERVICE" am: a664f20590
am: 81703ac3c3

Change-Id: If240710fd1f68fec5337982634a275febf09290f