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

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

Change-Id: Id2abe77f907c4ed9d5f1f518ec132b948f73cb92