Merge "Update the SDK for the tests with intended target in T+" am: b04664d7a6

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

Change-Id: I1328fee57a62d41956393b08291ba344fe210589