Merge "Sort codenames in version_defaults.rbc" am: 139fd3655b am: 979cb7d6ba

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

Change-Id: I8721caf36db022f15f08db1060412c15591541c1