Merge "Fix SignatureTest CTS failures in keymaster1_legacy_support" into stage-aosp-master