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

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

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