[automerger skipped] Merge "Add sdk extension version info to prop templates" into stage-aosp-master am: 674c51fa21 -s ours am: 295fc250b6 -s ours am: af49de1dc5 -s ours
am skip reason: Merged-In Ieea20731aed2e0f35bbe4cfd8ca596cf11f4b3bc with SHA-1 786bf26e3a is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/development/+/15727746
Change-Id: I25100154c33ef0b58dc5ed8ce4494412c13d4ba8
This commit is contained in: