Merge "keystore: Remove dead code" am: 6ff734224e

Original change: https://android-review.googlesource.com/c/platform/system/security/+/2587525

Change-Id: I53237d5987d1d0cf5cac2d6e2da507711fc5fcc2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>