Merge "「DO NOT MERGE」Revert "Get ApnIpType from ConnectivityManager#getLinkProperties()"" into rvc-dev am: eca0b3f9

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

Change-Id: Ib5126325e907f0f6c99d0281562ebcb195808e19