Merge "Remove userSerial param from vold methods that don't use it" into main am: 61024bccb1 am: fa8341c803

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2873075

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