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

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

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