Merge "Clear calling identity before calling TelephonyManager" into mnc-dev