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

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



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