[automerger skipped] Use the T shims in AOSP am: 47e778e301 -s ours

am skip reason: Merged-In I0c4e29568eadb6ef85ddadebbb37723adb9f29cd with SHA-1 22ea877f84 is already in history

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

Change-Id: I5d0b3bea01cc668bb07ea708ad4f9d90f01c39ea