Merge "DO NOT MERGE Revise security requirements for TelephonyManager#endCall." into oc-dev am: d3579f0c71
am: 77ce4e9cb5

Change-Id: Iec9bbf93fbfef5b4a3466485ba232a9ec38ec0bd