Merge "Add an annotation to skip tests if the APK has target SDK > 31." am: 85c3383b62

Original change: https://android-review.googlesource.com/c/platform/frameworks/libs/net/+/2110064

Change-Id: I6b62bf4f778e4d3a4e2cb7d9805c0a3812945bea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
tree: 8f29db87241a30b32063443a52764c7d12589c4c
  1. staticlibs/