Merge "Rename "user key" methods in vold" into main