Make vold use keystore2 instead of keymaster am: e8de4ffd73

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

Change-Id: I0a9b288902f5bb0f27d524dcf509ce461e4495fe