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: a79c6c49 am: 714c448c

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



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