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

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

Change-Id: Ic1b3d004e7d999e934cf47f987899c4ab378c12e