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