Merge "Modify sdk-annotations-*.zip and android_*_stbs_current_with_test_libs...

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

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



Change-Id: Ic7b0718caa1818d04f24570e15a2b89e0f23eea5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>