Merge "Remove unnecessary local variant definition." into main am: 147b6cbb am: 7d16f3d6

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



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