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