tree 2c795d33ddfe64d96f8c058afe4ad5df5536afa3
parent 93b7e9dbe36a72a7e0d43f994bad36fb40b55324
parent d0fc63cbc2fe09817f6fff44d11f0aa2764aad41
author Chalard Jean <jchalard@google.com> 1643326258 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1643326258 +0000

[automerger skipped] Use the T shims in AOSP am: 47e778e301 -s ours am: d0fc63cbc2 -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: I283fb7abc71d3b80feb00e84207a36247b332ad4