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: c6d711dd

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



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