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

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

Change-Id: I2efee244b37f94ffc058fff0a114b7fd19b9585f