Use the T shims in AOSP am: 47e778e301 am: 8d497a91eb am: 71bd427bd3

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

Change-Id: Ie6c7e5035ff64b04857fc55be69049ae83d31d60