[automerger skipped] Merge "Add new make variables for extension SDK version"...

[automerger skipped] Merge "Add new make variables for extension SDK version" into stage-aosp-master am: f330c725 -s ours

am skip reason: Merged-In Ib078a922e9bd9bc6ae82ab74feaeb743703a64b8 with SHA-1 2ea7e6ec is already in history

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

Change-Id: I91bffb8bf2e7a0849abe3bcb549d9fa9951a50eb