Merge "SurfaceFlinger_test: disable flaking child test" am: 5f1d615f68 am: ba5d8fb602

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

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