Merge "Fixing sffakehwc_test" am: 17f1f342e9

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

Change-Id: I3d9d96afb7da34ba5a6a5bfaf406bc1bb93ebc42