Merge "Make vold use the updated keystore 2 API for storage keys." am: 68bdb45cf8

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

Change-Id: Ib4156e85984c903cf521977e39522d013daf140c