[automerger skipped] release_config: various cleanup am: ec4761ae -s ours

am skip reason: Merged-In I4c38860c2fb24db5111e0cecf790660a4ff2b8b2 with SHA-1 ff387eaa is already in history

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



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