Merge "[automerger skipped] Merge "Make TelecomManager#endCall a public API." am: d63982cc03 am: 939a78b470  -s ours" into pi-dev-plus-aosp