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

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

Change-Id: Iab08102098f80f2211f9b24e2e9b8b6a384f8ced