[automerger skipped] Merge "「DO NOT MERGE」Revert "Get ApnIpType from...

[automerger skipped] Merge "「DO NOT MERGE」Revert "Get ApnIpType from ConnectivityManager#getLinkProperties()"" into rvc-dev am: eca0b3f9 am: 0c1708bf am: 635ab97c am: 82a9f99f -s ours

am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11899380

Change-Id: I1d595582ee48f7f480e7ea8c6840d0a31646c845