Merge "Remove unnecessary local variant definition." into main am: 147b6cbba5

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/3027003

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