Merge "Merge "aosp_apn_lint, Delete mms APN type in apns xml without mmsc" into main am: 60f42f281d am: 13615c2e2b" into udc-qpr-dev-plus-aosp