Merge "Rename "user key" methods in vold" into main am: b5c02ec9 am: 4695ab0a

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



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