Merge "Combine aconfig cache files into per-partition dumps." into main am:...

Merge "Combine aconfig cache files into per-partition dumps." into main am: 21e6105b am: a8e2b20b

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



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