Merge "Rename CallStateException ERROR_DISCONNECTED to ERROR_OUT_OF_SERVICE"
am: a664f20590

Change-Id: I866de672425e2018f0002e03d3ee49d7b0baed40