Merge "fskeyring & userspace reboot: support DE keys" into rvc-dev am: e8c7f09834 am: 1f444b9e60 am: 1e88970deb

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

Change-Id: I1c600b1d2517ae60720db4e061436dfd1fd5c8aa