Merge "Needed here to enable submitting the equivalent fix in AOSP. Generalize keystorekey for non odsign use cases" into stage-aosp-master am: d164f6f9df

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

Change-Id: I4d53bae7b72d12b40b2c5ca23b224b17d4fdb844