Merge "SurfaceFlinger_test: disable flaking child test" am: 5f1d615f am:...

Merge "SurfaceFlinger_test: disable flaking child test" am: 5f1d615f am: ba5d8fb6 am: 458e3014

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



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