[automerger skipped] Adjusted APN type capability and priority am: 195f896d...

[automerger skipped] Adjusted APN type capability and priority am: 195f896d am: e7a1812e -s ours am: 7030f2dd -s ours am: aaeca763 -s ours

am skip reason: Merged-In Id7b20d4a3f1d2467bd20ec40e25c7bac357accce with SHA-1 181e72ca is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/2095860



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