Merge "fskeyring & userspace reboot: support CE keys" into rvc-dev am: 58d89a355a am: 8968fc0219 am: 54773efd95

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

Change-Id: I690020e2527f6b8e13b0960a3e7b9620a37607f3