Merge changes from topic "aosp_starlark_release_config" am: d5eb7a6d am: 4792be76

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



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