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

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



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