Merge "Keystore 2.0 error module" am: dc246a01c1 am: 7b65a44a9a

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

Change-Id: I8480f50d43198bd6c83866f55229e402e143414f