Merge "Diced: Don't add resettable config" am: 8058404d27

Original change: https://android-review.googlesource.com/c/platform/system/security/+/2042543

Change-Id: I00c96b0cb7096484b281c5cd9d58483395df9667
Signed-off-by: Automerger Merge Worker