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

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

Change-Id: I5506a4ed4c7105d6102277b6fb659c3e39312197