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

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

Change-Id: I43dc48763918037d9e7f516092db5afeed1c61e1