Make vold use keystore2 instead of keymaster am: e8de4ffd73 am: 7a8ac746a2 am: b79360f80c

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

Change-Id: I7445d17137f563c5cb3f6d8e62f4bb92da2c2fa1