Merge "Keystore 2.0: Remove attestKey from KeyChain." into sc-dev