Merge "Rename "user key" methods in vold" into main am: b5c02ec925

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

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