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

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

Change-Id: I161a21264996e25d0ad76d501e57aaf58abbc077