[automerger skipped] Merge "Add sdk extension version info to prop templates" am: cf4b9a604d -s ours

am skip reason: Merged-In Ieea20731aed2e0f35bbe4cfd8ca596cf11f4b3bc with SHA-1 48c492ed9f is already in history

Original change: https://android-review.googlesource.com/c/platform/development/+/1810658

Change-Id: I67e0c653f2ae5bfc8f37345461b497ea8e0ec163