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

Change-Id: I83b81c5254a8773dd240f5604e008a91d8ac29a6