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

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



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