[automerger skipped] Merge "Add support for extension version in variables"...

[automerger skipped] Merge "Add support for extension version in variables" into stage-aosp-master am: a06d2d10 -s ours

am skip reason: Merged-In I82a90b83d23b0ba3779a943c2ad444bf5cf937da with SHA-1 6bec7b10 is already in history

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

Change-Id: I6fc8b24cadcf353ab10990a2df2f7eec29f577f4