Merge "Do not use build/trunk_release/release_config_map.mk" into main am:...

Merge "Do not use build/trunk_release/release_config_map.mk" into main am: 7167ed9a am: e88d8735

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



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