Merge changes from topic "vold-keystore2-fixes" am: 98692ab9bb

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

Change-Id: I310d09e283e3d8804ba7154295d9b004e95cda98