Merge "aosp_apn_lint, mmsport can only be present if proxy is set" into main am: c8901c27e2 am: e4b0f0734b am: d803be7446

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

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