[automerger skipped] Merge "Generalize keystorekey for non odsign use cases" am: f9f7724851 -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: Ic00657dfe6d23c2f9f70ec08ad981d4956ae8dae