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

Change-Id: Ie32fd970f6e1b011fca9e1b095d9ed0173864ecb