[automerger skipped] 「DO NOT MERGE」Revert "Get ApnIpType from ConnectivityManager#getLinkProperties()" am: d461be709f am: 7d4b7f3466 am: 5c2b5da743 am: 5a7c19b5a2 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I31e6b7991c5e48e45c236fa3d0ccc4d3041c195e