Merge "aosp_apn_lint, mmsport can only be present if proxy is set" into main