[automerger skipped] Merge "Rename two local variables" into sc-dev am: d9594308 am: caef6def -s ours

am skip reason: Merged-In Ia9c2d7a525e727f8706e66631b97fc4678c6a4d9 with SHA-1 06b95de9 is already in history

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

Change-Id: If29191daa29f35bc8ac16ae436b620a36f2d5707