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

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

Change-Id: I3c023063eff938812d7001d621d027b81572f4c8