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

Merge "Import surfaceflinger tests into renderengine's TEST_MAPPING" into tm-dev am: bad4627a am: a5b21a47 am: 5a60c07c

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



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