Merge "[automerger skipped] Merge identical key/val pairs in dynamic partition...

Merge "[automerger skipped] Merge identical key/val pairs in dynamic partition info am: f4406ca1 am: 99e57ceb -s ours" into tm-d1-dev-plus-aosp am: a3797bc3 -s ours

am skip reason: Merged-In I67747368547d3ef3e29ad64f8f818ef4c5896246 with SHA-1 f4406ca1 is already in history

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



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