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

Merge "Fix -Wunused-variable compiler warning" into main am: e5524c06 am: 522ebe90 am: fdd2376d

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



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