Merge "cosmetic: unused argument" into main am: 38a72e71 am: 5f8cb8a8 am:...

Merge "cosmetic: unused argument" into main am: 38a72e71 am: 5f8cb8a8 am: f729398f am: e42aed92 am: aeba964b

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



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