[automerger skipped] Generalize keystorekey for non odsign use cases am: b6ff0dcf7b -s ours am: 9b4ae46040 -s ours

am skip reason: Merged-In I4da6c732e93e1b5a43ade89291d544b8bf92121b with SHA-1 a20f50c847 is already in history

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

Change-Id: Iff0b39dceeebc0d6da2a95f78181080fed7435a6