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

Change-Id: Icdd743398edfa8222051066484ea7d3f046162f0