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

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

Change-Id: Ia5bae404c0984f49456b139e8e7b65f2fe31acd7