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

Merge "Fix -Wunused-variable compiler warning" into main am: 96fd39c2 am: b3062ab3 am: ea2692d8

Original change: https://android-review.googlesource.com/c/platform/system/core/+/2858392



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