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

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



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