Merge "Merge "Remove rundundant <test> tag" into android14-tests-dev am: 629a92deb0" into main am: 1bd43fbb2d

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

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