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

Change-Id: I8af234df95a1c79f53c3da3e3ced44c9f4d51d77