[automerger skipped] Merge "storageproxyd: Add arguments for storage mapping...

[automerger skipped] Merge "storageproxyd: Add arguments for storage mapping and max file" into main am: 63ef65c1 am: 0d49c512 am: 3e0d4b9f -s ours

am skip reason: Merged-In I67261a520bef86d2cf8f13e1c0f9731c4ed0b6f6 with SHA-1 b041bf19 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/27060585



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