[automerger skipped] Use the T shims in AOSP am: 47e778e301 am: 8d497a91eb am: 71bd427bd3 am: 983c6ea128 -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: I8faaed8f2587e5e2b3edb1f6b15265e44eba5989