Merge "Merge identical key/val pairs in dynamic partition info" am: d9e0788e am: 77bd852f

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



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