Merge "Only play end-of-call tone for certain call terminations" into nyc-mr1-dev