Merge "feed actual container name to storage file creation" into main am: 89839911

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



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