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

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

Change-Id: I7a45fdb9ed25c5543d0a9dda80106241f90e53db