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

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

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