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

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

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



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