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

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



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