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

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

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