[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: 691e4c64 am: 0b5cbc73 am: 3b36b0d9 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I7067042a11ed65d1172ebea163e8ab3b049f57a2