Merge "Check for FEATURE_TELEPHONY before clearing APNs"