[automerger skipped] Merge "Move the stable code from version_defaults.mk to version_util.mk." into sc-dev-plus-aosp am: 2c3c8d5ab1 am: 5b79cdb61f -s ours

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

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

Change-Id: I076df41f1dc8052ce2e505aa2f730558eecdf50d