Merge "Update aconfig storage generation function" into main am: 77f8360e

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



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