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

Change-Id: Ia8ff0b287624a034ba426887bccd2adf2c306d35