Merge "Move the graphics tests into a single folder" into main am: 2a4dab57...

Merge "Move the graphics tests into a single folder" into main am: 2a4dab57 am: 015d2b1e am: a70215cc

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



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