Merge "Rename "user key" methods in vold" into main am: b5c02ec9 am: 7eb9a899

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



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