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

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

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



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