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 am: f5233746

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



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