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

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

Change-Id: Ieb561f4c22643458dc90d2bc52598bbda78905eb