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

Merge "Fix -Wunused-variable compiler warning" into main am: 96fd39c2 am: 73d40d96 am: 7df332e9

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



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