Merge "Remove unused variable." into main am: bd66ab0a2b am: 600d87402c

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

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