Merge "storageproxyd: Add arguments for storage mapping and max file" into...

Merge "storageproxyd: Add arguments for storage mapping and max file" into main am: 63ef65c1 am: 0d49c512

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



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