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

Merge "surfaceflinger: Fix -Wunused-variable compiler warning" into main am: 330be7fa am: 0a213419 am: 0b3aa54a

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



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