Merge "Replace most references to Keymaster with Keystore" am: ec78a94586

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

Change-Id: Ic27ef7ebf2817da0a1a302ae77186ce3973368a1