Merge "aconfig: update storage file mapping api" into main am: 260663dd am: d557389e

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



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