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

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

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