Merge "Fix -Wunused-variable compiler warning" into main am: e5524c06 am: fc6126d3

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



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