Merge \"Map answered elsewhere telephony disconnect cause to telecom equivalent.\" into nyc-mr1-dev
am: b00a131d21

Change-Id: I2eb989b4723d7bc2ac4fa71478cb7a6f10e4517b