Merge changes from topic "aosp_starlark_release_config" am: d5eb7a6d

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



Change-Id: I6428f2094cc9c14fdcc964997730d469038c38b0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>