Merge "aosp_apn_lint, Delete mms APN type in apns xml without mmsc" into main am: 60f42f281d

Original change: https://android-review.googlesource.com/c/device/sample/+/2816857

Change-Id: I4ff7ffd32b17bf4b86c7e6aab2080ea1973c967c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>