[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." into stage-aosp-master am: acdfa0f4 -s ours

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

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

Change-Id: I24bffcfe55c36a3e7434b436b22b0b52c666d367