Merge "vold: remove session keyring workaround for old kernels" into main