Merge changes from topic "aconfig_dump_map" into main am: 25c187cc am: 1ed5d5ca

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



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