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

Change-Id: I2131df747b8528c8d21a2c7ea90a8ad7a78a1725