Merge "Remove unnecessary local variant definitation." into main am: 4c9c7f09

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



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