Use the T shims in AOSP am: 47e778e301

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1961301

Change-Id: Ida2de1ab2be7dd5fa330de60e3b9db119fed2562