Merge "Remove unnecessary local variant definitation." into main am: 4c9c7f092f am: e7d35e2861 am: 551407ffb5 am: 2d902bc2f5 am: c43674220b

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

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