Merge "aconfig: add storage file type into storage file serialization" into...

Merge "aconfig: add storage file type into storage file serialization" into main am: ee18b355 am: 3a0908ca

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



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