[automerger skipped] Merge "Make TelecomManager#endCall a public API." am: d63982cc03 am: 939a78b470  -s ours
am: 97ca723efa  -s ours

Change-Id: I34366631edc017fbc5e8f35b8dccdc1e3fe67095