Merge cherrypicks of ['googleplex-android-review.googlesource.com/28483938'] into udc-platform-release.

Change-Id: I582efdc8cb9125f0a752ec409792068e4e66fd8b

wire/src/legacy.rs

diff --git a/wire/src/legacy.rs b/wire/src/legacy.rs
index d418f82..3cd519b 100644
--- a/wire/src/legacy.rs
+++ b/wire/src/legacy.rs
@@ -601,12 +601,15 @@
     GetVersion = 7 =>                                (GetVersionRequest, GetVersionResponse),
     GetVersion2 = 28 =>                              (GetVersion2Request, GetVersion2Response),
     SetBootParams = 0x1000 =>                        (SetBootParamsRequest, SetBootParamsResponse),
+
+    // Provisioning-related requests. Changes here should be reflected in `is_trusty_provisioning_{code,req}`.
     SetAttestationKey = 0x2000 =>                    (SetAttestationKeyRequest, SetAttestationKeyResponse),
     AppendAttestationCertChain = 0x3000 =>           (AppendAttestationCertChainRequest, AppendAttestationCertChainResponse),
     ClearAttestationCertChain = 0xa000 =>            (ClearAttestationCertChainRequest, ClearAttestationCertChainResponse),
     SetWrappedAttestationKey = 0xb000 =>             (SetWrappedAttestationKeyRequest, SetWrappedAttestationKeyResponse),
     SetAttestationIds = 0xc000 =>                    (SetAttestationIdsRequest, SetAttestationIdsResponse),
     SetAttestationIdsKM3 = 0xc001 =>                 (SetAttestationIdsKM3Request, SetAttestationIdsKM3Response),
+
     ConfigureBootPatchlevel = 0xd0000 =>             (ConfigureBootPatchlevelRequest, ConfigureBootPatchlevelResponse),
 } }
 
@@ -643,6 +646,7 @@
             | Some(TrustyKeymasterOperation::ClearAttestationCertChain)
             | Some(TrustyKeymasterOperation::SetWrappedAttestationKey)
             | Some(TrustyKeymasterOperation::SetAttestationIds)
+            | Some(TrustyKeymasterOperation::SetAttestationIdsKM3)
     )
 }
 
@@ -655,6 +659,7 @@
             | TrustyPerformOpReq::ClearAttestationCertChain(_)
             | TrustyPerformOpReq::SetWrappedAttestationKey(_)
             | TrustyPerformOpReq::SetAttestationIds(_)
+            | TrustyPerformOpReq::SetAttestationIdsKM3(_)
     )
 }