[automerger skipped] Merge "Fix SignatureTest CTS failures in keymaster1_legacy_support" into stage-aosp-master am: c909e680fb am: ef221bf27e
am: 39066e8b83  -s ours

Change-Id: Ib6bbdf58f69a640312d59c5efbaa4282fb361726