Merge "Keystore 2.0 error module" am: dc246a01c1

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

Change-Id: Ib4e1817c0cd193c9947d1b0c9a604915d3e1afb3