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

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

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