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

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



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