Merge "Rename two local variables" into sc-dev am: d95943088e am: caef6def08

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

Change-Id: I5080775507f23eb67293aadc3e2ce4e7f42e3fd1