Merge "Update test annotation with new VsrTest tag" into udc-dev am: fedaf918 am: d59bd2cd

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/22236792



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