Merge "Add annotations to VTS tests" into main am: eed1c42087 am: db71f06e34

Original change: https://android-review.googlesource.com/c/platform/system/core/+/2984641

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