Merge "Move the graphics tests into a single folder" into main am: 2a4dab57b6 am: 015d2b1e81

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

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