[automerger skipped] Merge "DO NOT MERGE: Add SurfaceFlingerPerfTests" into...

[automerger skipped] Merge "DO NOT MERGE: Add SurfaceFlingerPerfTests" into tm-qpr-dev am: d2a46ddf am: eb53b715 -s ours

am skip reason: subject contains skip directive

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



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