[automerger skipped] Merge "DO NOT MERGE Revise security requirements for TelephonyManager#endCall." into oc-dev am: d3579f0c71 am: 77ce4e9cb5 am: bc96cc1934  -s ours
am: 7920402a2b

Change-Id: I7cbbc7aa9a79120fe43644b20e70b07415d0e14c