[automerger skipped] Merge "Rename two local variables" into sc-dev am:...

[automerger skipped] Merge "Rename two local variables" into sc-dev am: d9594308 -s ours am: c60b0ab6 -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: Ibb2bf119926d439b4dc773c7aaf237ff49d6919d