Merge "Merge "Get ApnIpType from ConnectivityManager#getLinkProperties()" into rvc-dev am: e186702a am: ad2a8b56" into rvc-d1-dev-plus-aosp