Merge changes from topic "vold-use-keystore2" am: 08873d0d7d am: 54460f0635

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

Change-Id: I8a70c04881275aa5e3bf4cf629316870798df27a