Merge "Move the graphics tests into a single folder" into main am: 2a4dab57b6 am: 4da5b86d45

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

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