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

Change-Id: Ifb8411845b2cac2bb016d554dae06693844e2bc2