tree 90c5e5f033cd8a5ce6dbb0ba4e51e6a603616b80
parent d535dc684636f8df75f742cbc5879ffe15eceff6
parent ec78a9458663838c16d780edba068b4847240839
author Eric Biggers <ebiggers@google.com> 1623793806 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1623793806 +0000

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