Merge "aconfig: package.map file serialization" into main am: 4575b273 am:...

Merge "aconfig: package.map file serialization" into main am: 4575b273 am: b879ecf2 am: 8d122362

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



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