Merge "SM: Change volume mountUserId for new user" into main am: c7bed872c0 am: 7f304c1cf3 am: d746d9cbce am: 57f69e62fe

Original change: https://android-review.googlesource.com/c/platform/system/vold/+/2657116

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