Merge "Merge "Import surfaceflinger tests into renderengine's TEST_MAPPING"...

Merge "Merge "Import surfaceflinger tests into renderengine's TEST_MAPPING" into tm-dev am: bad4627a am: da672cf3" into tm-d1-dev-plus-aosp am: 2fc2e91b

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



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