Merge "Modify sdk-annotations-*.zip and android_*_stbs_current_with_test_libs defintions" into main am: 45e63e8fad

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2945115

Change-Id: Ifd3b9572c10066036463653531ebc4318b4fd5e3
Signed-off-by: Automerger Merge Worker <[email protected]>