Merge "Remove unused variables in soong variables file" into main am: d816a727 am: b5b8902b

Original change: https://android-review.googlesource.com/c/platform/build/+/3114139



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