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

Merge "[automerger skipped] Merge "Rename two local variables" into sc-dev am: d9594308 -s ours am: c60b0ab6 -s ours" into sc-qpr1-dev-plus-aosp am: c64a5403 -s ours am: afabecd2 -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: Ic1057d35bfed7e4b4335d6d976a372f4ca8d6566