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

Merge "vold: remove session keyring workaround for old kernels" into main am: 69c4d769 am: 987629c0

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



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