Merge "surfaceflinger: Fix -Wunused-variable compiler warning" into main am: 330be7fa00

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

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