Merge "Fixing sffakehwc_test" am: 17f1f342e9 am: 216a5ec759

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

Change-Id: I0861936f6ab35e6e1718f9782e937a87f0e5a451