Merge "Add new dump format map in aconfig" into main am: 14a82dab am: 3d257187

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



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