Merge "Fix SurfaceFlinger_test on WCG devices" into udc-dev am: 19a4a081 am:...

Merge "Fix SurfaceFlinger_test on WCG devices" into udc-dev am: 19a4a081 am: 9ee046f5 am: 2a1b529d

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



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