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

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

Change-Id: I3842be2a6e0b583afa19f0594e76a6fc6a4ac948