[automerger skipped] Merge "Move the stable code from version_defaults.mk to...

[automerger skipped] Merge "Move the stable code from version_defaults.mk to version_util.mk." am: 258fca9a -s ours am: b476242c -s ours am: f0ea141e -s ours

am skip reason: Merged-In I4798fb69c639e6d52d275a5b793fa0c8ba876202 with SHA-1 cda1f376 is already in history

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

Change-Id: I160730118ed965b65034a0ce2afa7cbda8fbc879